Fixes a bug in updateLocale, a=chris
Fixes a bug in updateLocale, a=chris
diff --git a/lib/upgrade_functions.php b/lib/upgrade_functions.php
index 6bcbdce30..0f9a34ea0 100644
--- a/lib/upgrade_functions.php
+++ b/lib/upgrade_functions.php
@@ -40,9 +40,9 @@
function upgradeLocaleCheck()
{
global $locale_tag;
- $config_name = LOCALE_DIR."/$locale_tag/configure.ini";
+ $config_name = LOCALE_DIR."/$locale_tag/";
$fallback_config_name =
- FALLBACK_LOCALE_DIR."/$locale_tag/configure.ini";
+ FALLBACK_LOCALE_DIR."/$locale_tag/";
if(filemtime($fallback_config_name) > filemtime($config_name)) {
return "locale";
}
diff --git a/models/locale_model.php b/models/locale_model.php
index 5aadc010d..6f97d7a8b 100644
--- a/models/locale_model.php
+++ b/models/locale_model.php
@@ -621,11 +621,11 @@ class LocaleModel extends Model
}
if(file_exists($fallback_path.'/pages')) {
$this->updateLocaleSubFolder($cur_path.'/pages',
- $fallback_path.'/pages', array(".thtml"));
+ $fallback_path.'/pages', array("thtml"));
}
if(file_exists($fallback_path.'/resources')) {
$this->updateLocaleSubFolder($cur_path.'/resources',
- $fallback_path.'/resources', array(".php", ".ftr", ".txt.gz"));
+ $fallback_path.'/resources', array("php", "ftr", "txt.gz"));
}
$n = array();
$n[] = <<<EOT