provide ability to unset session language

diff --git a/include/text.php b/include/text.php
index 9ed6d23bfbe37a0bd92ec91cbf177f3de25efbc1..37af65c70d1460888b4cd4bdd1c47569c76c3dcd 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -847,10 +847,16 @@ function lang_selector() {
        $o .= '<form action="" method="post" ><select name="system_language" onchange="this.form.submit();" >';
        $langs = glob('view/*/strings.php');
        if(is_array($langs) && count($langs)) {
+               $langs[] = '';
                if(! in_array('view/en/strings.php',$langs))
                        $langs[] = 'view/en/';
                asort($langs);
                foreach($langs as $l) {
+                       if($l == '') {
+                               $default_selected = ((! x($_SESSION,'language')) ? ' selected="selected" ' : '');
+                               $o .= '<option value="" ' . $default_selected . '>' . t('default') . '</option>';
+                               continue;
+                       }
                        $ll = substr($l,5);
                        $ll = substr($ll,0,strrpos($ll,'/'));
                        $selected = (($ll === $lang) ? ' selected="selected" ' : '');

diff --git a/index.php b/index.php
index 80e8ca3b027de00de8c45540f790af8bfa0e0021..17d250e5fb9264ab94180774361439c7e8836bb6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -84,8 +84,12 @@ session_start();
  * We have to do it here because the session was just now opened.
  */
 
-if(x($_POST,'system_language'))
-       $_SESSION['language'] = $_POST['system_language'];
+if(array_key_exists('system_language',$_POST)) {
+       if(strlen($_POST['system_language']))
+               $_SESSION['language'] = $_POST['system_language'];
+       else
+               unset($_SESSION['language']);
+}
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
        $lang = $_SESSION['language'];
        load_translation_table($lang);