aboutsummaryrefslogtreecommitdiffstats
path: root/install/db
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-11-06 14:46:41 +0000
committerpatdenice <patdenice@piwigo.org>2008-11-06 14:46:41 +0000
commit5f1fe1d4f9b67b44b7166444de6034a4e6dadfdf (patch)
treea727e946f81f0b8815c86c17f9faf6ba246bc443 /install/db
parent894a38a9bf7c30662a75af78f3674dfa82414674 (diff)
merge -c2836 from trunk to branch 2.0
- Webmaster or administrator can login to run upgrade. - Inserting upgrade line in mysql.inc.php still work. - Convert espagnol upgrade file to utf8. - Minor changes in upgrade processus. - Remove all comments in pclzip.lib.php. git-svn-id: http://piwigo.org/svn/branches/2.0@2837 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--install/db/65-database.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/install/db/65-database.php b/install/db/65-database.php
index 0381f0ac3..c445b0ab6 100644
--- a/install/db/65-database.php
+++ b/install/db/65-database.php
@@ -129,8 +129,8 @@ SELECT language, COUNT(user_id) AS count FROM '.USER_INFOS_TABLE.'
$result = pwg_query($query);
while ( $row=mysql_fetch_assoc($result) )
{
- $lang = $row["language"];
- $lang_def = explode('.', $lang);
+ $language = $row["language"];
+ $lang_def = explode('.', $language);
if ( count($lang_def)==2 )
{
$new_lang = $lang_def[0];
@@ -141,12 +141,12 @@ SELECT language, COUNT(user_id) AS count FROM '.USER_INFOS_TABLE.'
$new_lang = 'en_UK';
$charset = 'iso-8859-1';
}
- $all_langs[$lang] = array(
+ $all_langs[$language] = array(
'count' => $row['count'],
'new_lang' => $new_lang,
'charset' => $charset,
);
- $upgrade_log .= ">>user_lang\t".$lang."\t".$row['count']."\n";
+ $upgrade_log .= ">>user_lang\t".$language."\t".$row['count']."\n";
}
$upgrade_log .= "\n";