Changeset 13956


Ignore:
Timestamp:
Apr 7, 2012, 11:00:51 PM (8 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/install.php

    r12922 r13956  
    166166{
    167167  $language = strip_tags($_GET['language']);
     168 
     169  if (!in_array($language, array_keys($languages->fs_languages)))
     170  {
     171    $language = PHPWG_DEFAULT_LANGUAGE;
     172  }
    168173}
    169174else
  • trunk/plugins/language_switch/language_switch.inc.php

    r12922 r13956  
    4242    if (isset($_GET['lang']))
    4343    {
     44      include_once(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
     45      $languages = new languages();
     46      if (!in_array($_GET['lang'], array_keys($languages->fs_languages)))
     47      {
     48        $_GET['lang'] = PHPWG_DEFAULT_LANGUAGE;
     49      }
     50
    4451      if (!empty($_GET['lang']) and file_exists(PHPWG_ROOT_PATH.'language/'.$_GET['lang'].'/common.lang.php'))
    4552      {
  • trunk/upgrade.php

    r12922 r13956  
    143143{
    144144  $language = strip_tags($_GET['language']);
     145
     146  if (!in_array($language, array_keys($languages->fs_languages)))
     147  {
     148    $language = PHPWG_DEFAULT_LANGUAGE;
     149  }
    145150}
    146151else
Note: See TracChangeset for help on using the changeset viewer.