Merge branch 'teuto/6084-global-conf-variable' into 'develop'

Marius Burkard · Marius Burkard · commit 91ea8545ebda · 2021-05-21T12:57:39.000Z
fixes #6084

Closes #6084

See merge request ispconfig/ispconfig3!1425
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
@@ -130,8 +130,8 @@ public function initialize_session() {
 
 			//* Initialize session variables
 			if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();
-			if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];
-			if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
+			if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $this->_conf['theme'];
+			if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $this->_conf['language'];
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ public function initialize_session() {`
`130`	`130`
`131`	`131`	`//* Initialize session variables`
`132`	`132`	`if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();`
`133`		`- if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];`
`134`		`- if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];`
	`133`	`+ if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $this->_conf['theme'];`
	`134`	`+ if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $this->_conf['language'];`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`}`