aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-04-07 21:00:51 +0000
committerplegall <plg@piwigo.org>2012-04-07 21:00:51 +0000
commitc59b052d7c84001fb267b38e24c20c51b33c6853 (patch)
tree1060afdda69dcbbed1dc4c23c9e93d863c4851c9 /plugins
parent81e52ca60367de6ba7360a37922fbf14d4311ccf (diff)
merge r13955 from branch 2.3 to trunk
bug 2610 fixed: make sure the $_GET['lang'] or $_GET['language'] is in the list of available languages. git-svn-id: http://piwigo.org/svn/trunk@13956 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--plugins/language_switch/language_switch.inc.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index 9ba5b0931..fc06da5d3 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -41,6 +41,13 @@ class language_controler
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'))
{
if (is_a_guest() or is_generic())