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

3 files changed, 6 insertions, 6 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";
 
diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php
index 0ce03ece6..8bc0d1c93 100644
--- a/install/upgrade_1.3.1.php
+++ b/install/upgrade_1.3.1.php
@@ -591,7 +591,7 @@ previous configuration',
     'in include/mysql.inc.php, before
 <pre style="background-color:lightgray">?&gt;</pre>
 insert
-<pre style="background-color:lightgray">define(\'PHPWG_INSTALLED\', true);<pre>'
+<pre style="background-color:lightgray">define(\'PHPWG_INSTALLED\', true);</pre>'
     )
   );
 
diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php
index 413170f4a..c4241dd51 100644
--- a/install/upgrade_1.7.0.php
+++ b/install/upgrade_1.7.0.php
@@ -116,7 +116,7 @@ INSERT INTO `'.PREFIX_TABLE.'upgrade`
 }
 
 echo '</pre>';
-ob_clean();
+ob_end_clean();
 
 // now we upgrade from 2.0.0
 // include_once(PHPWG_ROOT_PATH.'install/upgrade_2.0.0.php');