From b0cc8f1bc2be174105cd71b3d31e7ae3f51ee0c6 Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 20 Sep 2014 11:43:01 +0000 Subject: * 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 --- include/functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions.inc.php') 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 -- cgit v1.2.3