Merged in julceslau/processmaker (pull request #908)

Fix a couple of strict notices for PHP 5.4
This commit is contained in:
Julio Cesar Laura Avendaño
2014-10-13 15:15:18 -04:00
2 changed files with 9 additions and 10 deletions

View File

@@ -5273,7 +5273,7 @@ class G
/** /**
*/ */
public function auditLog($actionToLog, $valueToLog = "") public static function auditLog($actionToLog, $valueToLog = "")
{ {
$oServerConf = & serverConf::getSingleton(); $oServerConf = & serverConf::getSingleton();
$sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS ); $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', SYS_SYS );

View File

@@ -76,7 +76,7 @@ class serverConf
* *
* @return object * @return object
*/ */
public function &getSingleton() public static function &getSingleton()
{ {
if (self::$instance == null) { if (self::$instance == null) {
self::$instance = new serverConf(); self::$instance = new serverConf();
@@ -518,4 +518,3 @@ class serverConf
return in_array($lang, $this->rtlLang); return in_array($lang, $this->rtlLang);
} }
} }