- local.lang is loaded without fallback on default language or PHPWG_DEFAULT_LANGUAGE (needed to change the signature of load_language which became a little too big)

- move a function from functions.inc.php to functions_picture.inc.php (included only when necessary)
- removed some css (not as much as I wanted)

git-svn-id: http://piwigo.org/svn/trunk@2479 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 4 insertions, 4 deletions

diff --git a/plugins/add_index/main.normal.inc.php b/plugins/add_index/main.normal.inc.php
index 6f43c6e40..3a0592b92 100644
--- a/plugins/add_index/main.normal.inc.php
+++ b/plugins/add_index/main.normal.inc.php
@@ -33,7 +33,7 @@ class NormalAddIndex extends AddIndex
     if (in_array($page, array('advanced_feature', 'site_manager')))
     {
       $help_content =
-        load_language('help/'.$page.'.html', $this->path, '', true);
+        load_language('help/'.$page.'.html', $this->path, array('return'=>true) );
     }
     else
     {
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index baaa0375a..d69db1c5e 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -57,11 +57,11 @@ function language_switch()
 // Reload language only if it isn't the same one
   if ( $same !== $user['language'])
   {
-    load_language('common.lang', '', $user['language']);
-    load_language('local.lang', '', $user['language']);
+    load_language('common.lang', '', array('language'=>$user['language']) );
+    load_language('local.lang', '', array('language'=>$user['language'], 'no_fallback'=>true) );
     if (defined('IN_ADMIN') and IN_ADMIN)
     {
-      load_language('admin.lang', '', $user['language']);
+      load_language('admin.lang', '', array('language'=>$user['language']) );
     }
   }
 }