nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace the direct access of config variables

Browse source
This commit is contained in:
Michael 2017-01-17 19:21:46 +00:00
commit 53393233c3
5 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/pgettext.php
View file

@ -10,6 +10,8 @@
*
*/
use \Friendica\Core\Config;
require_once("include/dba.php");
if(! function_exists('get_browser_language')) {
@ -47,12 +49,12 @@ function get_browser_language() {
break;
}
}
if(isset($preferred))
if (isset($preferred)) {
return $preferred;
}
// in case none matches, get the system wide configured language, or fall back to English
$a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
return Config::get('system', 'language', 'en');
}}