diff options
author | rub <rub@piwigo.org> | 2007-03-13 23:01:16 +0000 |
---|---|---|
committer | rub <rub@piwigo.org> | 2007-03-13 23:01:16 +0000 |
commit | c5da19e5362101517d3f805c86132016b90bd271 (patch) | |
tree | 2751d89bb79584f8a32192c21f6b2429fc7794ce /include/functions_user.inc.php | |
parent | 6295173652a7767fa482df231ae7a9034b89ecde (diff) |
Fix bad default value for language on table user_info
Improve mail send (Undisclosed-recipients, switch language, ...)
Improve send an email to group members (Use Bcc, template, multi-language, ...) (But need more improvements)
git-svn-id: http://piwigo.org/svn/trunk@1904 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/functions_user.inc.php')
-rw-r--r-- | include/functions_user.inc.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index 72754ca33..c3608eee3 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -804,14 +804,16 @@ SELECT name * return the file path of the given language filename, depending on the * availability of the file * - * in descending order of preference: user language, default language, + * in descending order of preference: + * param language, user language, default language * PhpWebGallery default language. * * @param string filename * @param string dirname + * @param string language * @return string filepath */ -function get_language_filepath($filename, $dirname = '') +function get_language_filepath($filename, $dirname = '', $language = '') { global $user, $conf; @@ -822,7 +824,11 @@ function get_language_filepath($filename, $dirname = '') $dirname .= 'language'.'/'; $directories = array(); - if ( isset($user['language']) ) + if ( !empty($language) ) + { + $directories[] = $dirname.$language; + } + { $directories[] = $dirname.$user['language']; } |