Separate class for view and print links.

[fa-stable.git] / includes / lang / language.php

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 54302ebe5a1fe887ff1359a3ae51a633d865fbfb..ea428fca07b5463e3cfc310142b05ad98a9610ec 100644 (file)
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -12,7 +12,7 @@
 // Prevent register_globals vulnerability
 if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
        die("Restricted access");
-include_once($path_to_root . "/lang/installed_languages.inc");
+@include_once($path_to_root . "/lang/installed_languages.inc");
 include_once($path_to_root . "/includes/lang/gettext.php");
 
 class language 
@@ -30,7 +30,7 @@ class language
                global $dflt_lang;
                
                $this->name = $name;
-               $this->code = $code ? $code : ($dflt_lang ? $dflt_lang : 'en_GB');
+               $this->code = $code ? $code : ($dflt_lang ? $dflt_lang : 'C');
                $this->encoding = $encoding;
                $this->dir = $dir;
        }
@@ -50,8 +50,8 @@ class language
        {
            global $path_to_root, $installed_languages;
 
-               $changed = $this->code != $code;
                $lang = array_search_value($code, $installed_languages, 'code');
+               $changed = $this->code != $code || $this->version != @$lang['version'];
 
                if ($lang && $changed)
                {
@@ -61,8 +61,8 @@ class language
                        $this->name = $lang['name'];
                        $this->code = $lang['code'];
                        $this->encoding = $lang['encoding'];
-                       $this->version = $lang['version'];
-                       $this->dir = isset($lang['rtl']) ? 'rtl' : 'ltr';
+                       $this->version = @$lang['version'];
+                       $this->dir = (isset($lang['rtl']) && $lang['rtl'] === true) ? 'rtl' : 'ltr';
                        $locale = $path_to_root . "/lang/" . $this->code . "/locale.inc";
                        $this->is_locale_file = file_exists($locale);
                }