Changeset 1319

Timestamp:

May 23, 2006, 11:15:34 PM (18 years ago)

Author:

plg

Message:

bug fixed: many errors reported if your database contains something else
than PhpWebGallery tables.

File:

• branches/branch-1_6/upgrade.php (modified) (4 diffs)

branches/branch-1_6/upgrade.php

@@ -82 +82 @@
   while ($row = mysql_fetch_row($result))
   {
-    array_push(
-      $tables,
-      preg_replace('/^'.PREFIX_TABLE.'/', '', $row[0])
-      );
+    if (preg_match('/^'.PREFIX_TABLE.'/', $row[0]))
+    {
+      array_push($tables, $row[0]);
+    }
   }
 
@@ -103 +103 @@
   {
     $query = '
-DESC '.PREFIX_TABLE.$table.'
+DESC '.$table.'
 ;';
     $result = mysql_query($query);
@@ -162 +162 @@
   $columns_of = get_columns_of($tables);
 
-  if (!in_array('param', $columns_of['config']))
+  if (!in_array('param', $columns_of[PREFIX_TABLE.'config']))
   {
     // we're in branch 1.3, important upgrade, isn't it?
-    if (in_array('user_category', $tables))
+    if (in_array(PREFIX_TABLE.'user_category', $tables))
     {
       $current_release = '1.3.1';
@@ -174 +174 @@
     }
   }
-  else if (!in_array('user_cache', $tables))
+  else if (!in_array(PREFIX_TABLE.'user_cache', $tables))
   {
     $current_release = '1.4.0';
   }
-  else if (!in_array('tags', $tables))
+  else if (!in_array(PREFIX_TABLE.'tags', $tables))
   {
     $current_release = '1.5.0';