mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2025-03-12 08:56:34 -04:00
Merge pull request #1522 from jacquesbh/avoid-multiple-configuration-instances
Do not instanciate the Configuration more than once
This commit is contained in:
commit
e67972417e
@ -190,8 +190,6 @@ class Controller
|
||||
*/
|
||||
private function _setDefaultLanguage()
|
||||
{
|
||||
$this->_conf = new Configuration;
|
||||
|
||||
$lang = $this->_conf->getKey('languagedefault');
|
||||
I18n::setLanguageFallback($lang);
|
||||
// force default language, if language selection is disabled and a default is set
|
||||
@ -208,8 +206,6 @@ class Controller
|
||||
*/
|
||||
private function _setDefaultTemplate()
|
||||
{
|
||||
$this->_conf = new Configuration;
|
||||
|
||||
$templates = $this->_conf->getKey('availabletemplates');
|
||||
$template = $this->_conf->getKey('template');
|
||||
TemplateSwitcher::setAvailableTemplates($templates);
|
||||
|
Loading…
x
Reference in New Issue
Block a user