Fix language_ui pref

textpattern · Nov 14, 2017 · aa446fd · aa446fd · Bloke · Nov 26, 2017
1 parent 1cd1960
commit aa446fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/textpattern/include/txp_lang.php b/textpattern/include/txp_lang.php
@@ -264,7 +264,7 @@ function save_language_ui()
 
         if ($locale) {
             $msg = gTxt('preferences_saved');
-            set_pref('language_ui', $language_ui, 'admin', PREF_CORE, 'text_input', 0, PREF_PRIVATE);
+            set_pref('language_ui', $language_ui);
             $textarray = load_lang($language_ui);
         } else {
             $msg = array(gTxt('locale_not_available_for_language', array('{name}' => $langName)), E_WARNING);
@@ -390,7 +390,7 @@ function remove_language()
         $site_lang = get_pref('language', TEXTPATTERN_DEFAULT_LANG, true);
         $ui_lang = get_pref('language_ui', $site_lang, true);
         $ui_lang = (array_key_exists($ui_lang, $represented_lang)) ? $ui_lang : $site_lang;
-        set_pref('language_ui', $ui_lang, 'admin', PREF_CORE, 'text_input', 0, PREF_PRIVATE);
+        set_pref('language_ui', $ui_lang);
         $textarray = load_lang($ui_lang);
     } else {
         $msg = gTxt('cannot_delete', array('{thing}' => $langName));

diff --git a/textpattern/vendors/Textpattern/DB/Core.php b/textpattern/vendors/Textpattern/DB/Core.php
@@ -166,6 +166,7 @@ public function getPrefsDefault()
         $pf['blog_mail_uid']  = empty($_SESSION['email']) ? md5(rand()).'blog@gmail.com' : $_SESSION['email'];
         $pf['blog_uid']       = empty($blog_uid) ? md5(uniqid(rand(), true)) : $blog_uid;
         $pf['language']       = $language;
+        $pf['language_ui']    = $language;
         $pf['locale']         = getlocale($language);
         $pf['sitename']       = gTxt('my_site');
         $pf['site_slogan']    = gTxt('my_slogan');

diff --git a/textpattern/vendors/Textpattern/DB/Data/core.prefs b/textpattern/vendors/Textpattern/DB/Data/core.prefs
@@ -444,7 +444,7 @@
         "val": "",
         "type": "2",
         "event": "publish",
-        "html": "languages",
+        "html": "text_input",
         "position": "0"
     },
     "lastmod": {
@@ -657,6 +657,14 @@
         "html": "yesnoradio",
         "position": "240"
     },
+    "language_ui": {
+        "val": "",
+        "type": "2",
+        "event": "admin",
+        "html": "text_input",
+        "position": "0",
+        "private": "1"
+    },
     "default_publish_status": {
         "val": "4",
         "type": "0",