diff options
author | Renato Botelho <renato@netgate.com> | 2016-01-22 12:28:37 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-01-22 12:28:37 -0200 |
commit | 9f2f1ddaaac1b479049af943a268e88af8d1acbe (patch) | |
tree | 3922a23d2f6eee54a93a27d8b4c7ed3997d4da79 | |
parent | 53c25dec801ea7083a8ce4836133591a0e6483df (diff) | |
download | pfsense-9f2f1ddaaac1b479049af943a268e88af8d1acbe.zip pfsense-9f2f1ddaaac1b479049af943a268e88af8d1acbe.tar.gz |
Move set_language() call back to guiconfig.inc since it's causing trouble on console
-rw-r--r-- | src/etc/inc/config.inc | 5 | ||||
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index 1f64b9a..2d98eae 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -229,11 +229,6 @@ if (isset($config['system']['timezone']) && } date_default_timezone_set("$timezone"); -if (!function_exists('set_language')) { - require_once("pfsense-utils.inc"); -} -set_language(); - if ($config_parsed == true) { /* process packager manager custom rules */ if (is_dir("/usr/local/pkg/parse_config")) { diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 643d410..21e96ba 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -91,6 +91,11 @@ $navlevelsep = ": "; /* navigation level separator string */ $mandfldhtml = ""; /* display this before mandatory input fields */ $mandfldhtmlspc = ""; /* same as above, but with spacing */ +if (!function_exists('set_language')) { + require_once("pfsense-utils.inc"); +} +set_language(); + /* Some ajax scripts still need access to GUI */ if (!$ignorefirmwarelock) { if (is_subsystem_dirty('firmwarelock')) { |