Change constructor parameter position

This commit is contained in:
2019-11-02 19:52:05 +01:00
parent 229aeedea9
commit 96e54cfb4e

View File

@@ -53,7 +53,7 @@ abstract class Main extends PhpObject
* @param ClassManagement $oClassManagement * @param ClassManagement $oClassManagement
* @param string $sLang * @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); parent::__construct($sFile, Settings::DEBUG);
$this->oClassManagement = $oClassManagement; $this->oClassManagement = $oClassManagement;
@@ -80,6 +80,8 @@ abstract class Main extends PhpObject
private function setContext($sProcessPage, $sTimeZone='') private function setContext($sProcessPage, $sTimeZone='')
{ {
die(print_r(($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone, true));
//Browser <> PHP <> MySql synchronization //Browser <> PHP <> MySql synchronization
date_default_timezone_set(($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone); date_default_timezone_set(($sTimeZone=='')?Settings::TIMEZONE:$sTimeZone);
ini_set('default_charset', Settings::TEXT_ENC); ini_set('default_charset', Settings::TEXT_ENC);
@@ -167,7 +169,7 @@ abstract class Main extends PhpObject
return json_encode($asResult); 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); return array('result'=>$bSuccess, 'desc'=>$sDesc, 'data'=>$asVars);
} }