- RSS feed is PWG charset

- iptc are now converted from iso-8859-1 or utf-8 (automatic detection) to pwg charset
- remove function get_language_filepath
- load_language also checks for the default language


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

1 files changed, 4 insertions, 1 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index c12bdcda5..e1723b601 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1499,11 +1499,14 @@ function load_language($filename, $dirname = '', $language = '',
   {
     $languages[] = $language;
   }
-
   if ( !empty($user['language']) )
   {
     $languages[] = $user['language'];
   }
+  if ( defined('PHPWG_INSTALLED') )
+  {
+    $languages[] = get_default_language();
+  }
   $languages[] = PHPWG_DEFAULT_LANGUAGE;
   $languages = array_unique($languages);