diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index e07d8e4f2..a2a709fef 100755 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -2296,7 +2296,7 @@ class G * @param string $sText * @return string strtolower($sText) */ - public function toLower ($sText) + public static function toLower ($sText) { return strtolower( $sText ); } @@ -5260,12 +5260,12 @@ class G * @param type $pathData * @param type $file */ - public function log($message, $pathData = PATH_DATA, $file = 'cron.log') + public static function log($message, $pathData = PATH_DATA, $file = 'cron.log') { $config = System::getSystemConfiguration(); G::LoadSystem('logger'); - $oLogger =& Logger::getSingleton($pathData, PATH_SEP, $file); + $oLogger = Logger::getSingleton($pathData, PATH_SEP, $file); $oLogger->limitFile = $config['number_log_file']; $oLogger->limitSize = $config['size_log_file']; $oLogger->write($message); diff --git a/gulliver/system/class.logger.php b/gulliver/system/class.logger.php index c107dd71d..080c62b93 100644 --- a/gulliver/system/class.logger.php +++ b/gulliver/system/class.logger.php @@ -46,7 +46,7 @@ class Logger $this->filePath = $this->path . $this->fullName; } - public function getSingleton($pathData, $pathSep, $file = 'cron.log') + public static function getSingleton($pathData, $pathSep, $file = 'cron.log') { if (self::$instance == null) { self::$instance = new Logger($pathData, $pathSep, $file); diff --git a/workflow/engine/classes/class.pmLicenseManager.php b/workflow/engine/classes/class.pmLicenseManager.php index ace704336..a92aec915 100644 --- a/workflow/engine/classes/class.pmLicenseManager.php +++ b/workflow/engine/classes/class.pmLicenseManager.php @@ -19,7 +19,7 @@ class pmLicenseManager //to do: this files probably needs to be in core, since they are GPL2 //include_once (PATH_PLUGINS . 'enterprise' . PATH_SEP . 'classes' . PATH_SEP . 'class.license.lib.php'); //include_once (PATH_PLUGINS . 'enterprise' . PATH_SEP . 'classes' . PATH_SEP . 'class.license.app.php'); - + require_once PATH_CORE . 'classes' . PATH_SEP . 'class.license.lib.php'; require_once PATH_CORE . 'classes' . PATH_SEP . 'class.license.app.php'; @@ -113,7 +113,7 @@ class pmLicenseManager $this->activateFeatures (); } - public function &getSingleton() + public static function getSingleton() { if (self::$instance == null) { self::$instance = new pmLicenseManager ();