mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-27 19:59:56 +03:00
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
This commit is contained in:
parent
6295173652
commit
c5da19e536
7 changed files with 320 additions and 56 deletions
|
@ -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'];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue