aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-09-20 11:43:01 +0000
committerplegall <plg@piwigo.org>2014-09-20 11:43:01 +0000
commitb0cc8f1bc2be174105cd71b3d31e7ae3f51ee0c6 (patch)
tree4e436a9aa74c2de02fc8d5288c9d60a58bff6c66 /include
parent4e612f3e59de9292ff9034cc69127003574bc1dc (diff)
* feature 3142: upgrade script to Piwigo 2.7
* link to Tour 2_7_0 at the end of upgrade * activate plugin Take a Tour by default git-svn-id: http://piwigo.org/svn/trunk@29665 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/functions.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 52c4d418f..7d8957bd3 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1512,7 +1512,7 @@ function load_language($filename, $dirname = '', $options = array())
}
$dirname .= 'language/';
- $default_language = defined('PHPWG_INSTALLED') ?
+ $default_language = defined('PHPWG_INSTALLED') and !defined('UPGRADES_PATH') ?
get_default_language() : PHPWG_DEFAULT_LANGUAGE;
// construct list of potential languages