mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 20:59:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r13955 from branch 2.3 to trunk

Browse source 
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
This commit is contained in:
plegall 2012-04-07 21:00:51 +00:00
parent 81e52ca603
commit c59b052d7c
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
install.php
View file

@ -165,6 +165,11 @@ $languages = new languages('utf-8');
if (isset($_GET['language'])) if (isset($_GET['language']))
{ {
$language = strip_tags($_GET['language']); $language = strip_tags($_GET['language']);
if (!in_array($language, array_keys($languages->fs_languages)))
{
$language = PHPWG_DEFAULT_LANGUAGE;
}
} }
else else
{ {

7
plugins/language_switch/language_switch.inc.php
View file

@ -41,6 +41,13 @@ class language_controler
if (isset($_GET['lang'])) 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 (!empty($_GET['lang']) and file_exists(PHPWG_ROOT_PATH.'language/'.$_GET['lang'].'/common.lang.php'))
{ {
if (is_a_guest() or is_generic()) if (is_a_guest() or is_generic())

5
upgrade.php
View file

@ -142,6 +142,11 @@ $languages = new languages('utf-8');
if (isset($_GET['language'])) if (isset($_GET['language']))
{ {
$language = strip_tags($_GET['language']); $language = strip_tags($_GET['language']);
if (!in_array($language, array_keys($languages->fs_languages)))
{
$language = PHPWG_DEFAULT_LANGUAGE;
}
} }
else else
{ {