Changeset 29840 for trunk/include

Timestamp:

Sep 30, 2014, 10:23:34 AM (10 years ago)

Author:

plg

Message:

bug 3111: cleaner code for get_browser_language (no more reference as parameter)

Location:

trunk/include

Files:

• functions_user.inc.php (modified) (3 diffs)
• user.inc.php (modified) (1 diff)

trunk/include/functions_user.inc.php

@@ -220 +220 @@
     }
 
-    $override = null;
-    if ($notify_admin and $conf['browser_language'])
-    {
-      // if function get_browser_language finds a language in the browser
-      // which matches a language activated in Piwigo, then it sets
-      // $override['language'] to 'ru' (for example) and returns
-      // true. $override won't stay null
-      if (!get_browser_language($override['language']))
-      {
-        $override=null;
-      }
-    }
+    $override = array();
+    if ($language = get_browser_language())
+    {
+      $override['language'] = $language;
+    }
+    
     create_user_infos($user_id, $override);
 
@@ -814 +808 @@
  * @todo : try to match 'fr_CA' before 'fr'
  *
- * @param string &$lang
- * @return bool
- */
-function get_browser_language(&$lang)
+ * @return string
+ */
+function get_browser_language()
 {
   $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
@@ -824 +817 @@
     if (substr($language_code, 0, 2) == $browser_language)
     {
-      $lang = $language_code;
-      return true;
+      return $language_code;
     }
   }

trunk/include/user.inc.php

@@ -69 +69 @@
           ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
          );
-if ($conf['browser_language'] and (is_a_guest() or is_generic()) )
+if ($conf['browser_language'] and (is_a_guest() or is_generic()) and $language = get_browser_language())
 {
-  get_browser_language($user['language']);
+  $user['language'] = $language;
 }
 trigger_notify('user_init', $user);