aboutsummaryrefslogtreecommitdiffstats
path: root/include/functions.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-10-09 22:43:09 +0000
committerrvelices <rv-github@modusoptimus.com>2007-10-09 22:43:09 +0000
commit5aafffb22b39c7347e261e2a7f56ba541e5f079e (patch)
treeddfbb654823b184c8596ba5b62f3597f0860f1f5 /include/functions.inc.php
parent762562ddbee37d8facc6aac6a313bb11ea540526 (diff)
- 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
Diffstat (limited to '')
-rw-r--r--include/functions.inc.php5
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);