Changeset 13956

Timestamp:

Apr 7, 2012, 11:00:51 PM (12 years ago)

Author:

plg

Message:

merge r13955 from branch 2.3 to trunk

bug 2610 fixed: make sure the $_GETlang or $_GETlanguage is in the
list of available languages.

Location:

trunk

Files:

• install.php (modified) (1 diff)
• plugins/language_switch/language_switch.inc.php (modified) (1 diff)
• upgrade.php (modified) (1 diff)

trunk/install.php

@@ -166 +166 @@
 {
   $language = strip_tags($_GET['language']);
+  
+  if (!in_array($language, array_keys($languages->fs_languages)))
+  {
+    $language = PHPWG_DEFAULT_LANGUAGE;
+  }
 }
 else

trunk/plugins/language_switch/language_switch.inc.php

@@ -42 +42 @@
     if (isset($_GET['lang']))
     {
+      include_once(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
+      $languages = new languages();
+      if (!in_array($_GET['lang'], array_keys($languages->fs_languages)))
+      {
+        $_GET['lang'] = PHPWG_DEFAULT_LANGUAGE;
+      }
+
       if (!empty($_GET['lang']) and file_exists(PHPWG_ROOT_PATH.'language/'.$_GET['lang'].'/common.lang.php'))
       {

trunk/upgrade.php

@@ -143 +143 @@
 {
   $language = strip_tags($_GET['language']);
+
+  if (!in_array($language, array_keys($languages->fs_languages)))
+  {
+    $language = PHPWG_DEFAULT_LANGUAGE;
+  }
 }
 else