From 96e54cfb4ec0e915e445b71d27161831b0cb848d Mon Sep 17 00:00:00 2001 From: Franzz Date: Sat, 2 Nov 2019 19:52:05 +0100 Subject: [PATCH] Change constructor parameter position --- inc/main.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/main.php b/inc/main.php index 7cedae3..bcdc078 100755 --- a/inc/main.php +++ b/inc/main.php @@ -53,7 +53,7 @@ abstract class Main extends PhpObject * @param ClassManagement $oClassManagement * @param string $sLang */ - public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array(), $bDb=true, $sTimeZone='', $sFile=__FILE__) + public function __construct($oClassManagement, $sProcessPage, $asMandatoryClasses=array(), $bDb=true, $sFile=__FILE__, $sTimeZone='') { parent::__construct($sFile, Settings::DEBUG); $this->oClassManagement = $oClassManagement; @@ -80,6 +80,8 @@ abstract class Main extends PhpObject private function setContext($sProcessPage, $sTimeZone='') { + die(print_r(($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone, true)); + //Browser <> PHP <> MySql synchronization date_default_timezone_set(($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone); ini_set('default_charset', Settings::TEXT_ENC); @@ -167,7 +169,7 @@ abstract class Main extends PhpObject return json_encode($asResult); } - public static function getResult($bSuccess, $sDesc, $asVars) { + public static function getResult($bSuccess, $sDesc, $asVars=array()) { return array('result'=>$bSuccess, 'desc'=>$sDesc, 'data'=>$asVars); }