summaryrefslogtreecommitdiff
path: root/includes/classes/LibertyContent.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/classes/LibertyContent.php')
-rw-r--r--includes/classes/LibertyContent.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/classes/LibertyContent.php b/includes/classes/LibertyContent.php
index 4da4f1b..4c148df 100644
--- a/includes/classes/LibertyContent.php
+++ b/includes/classes/LibertyContent.php
@@ -1163,7 +1163,7 @@ class LibertyContent extends LibertyBase implements BitCacheable {
* Set up SQL strings for services used by the object
* TODO: set this function deprecated and eventually nuke it
*/
- function getServicesSql( $pServiceFunction, &$pSelectSql, &$pJoinSql, &$pWhereSql, &$pBindVars, $pObject = NULL, &$pParamHash = NULL ) {
+ static protected function getServicesSql( $pServiceFunction, &$pSelectSql, &$pJoinSql, &$pWhereSql, &$pBindVars, $pObject = NULL, &$pParamHash = NULL ) {
//deprecated( 'You package is calling the deprecated LibertyContent::getServicesSql() method. Please update your code to use LibertyContent::getLibertySql' );
global $gLibertySystem;
if( $loadFuncs = $gLibertySystem->getServiceValues( $pServiceFunction ) ) {
@@ -1172,7 +1172,7 @@ class LibertyContent extends LibertyBase implements BitCacheable {
if( !empty( $pObject ) && is_object( $pObject ) ) {
$loadHash = $func( $pObject, $pParamHash );
} else {
- $loadHash = $func( $this, $pParamHash );
+ $loadHash = $func( (!empty( $pObject ) ? $this : NULL), $pParamHash );
}
if( !empty( $loadHash['select_sql'] ) ) {
$pSelectSql .= $loadHash['select_sql'];