From 108937e81aa75c65d1b562260293c2e809bc1066 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Sat, 1 Nov 2008 21:22:08 +0000
Subject: merge -c2815 from trunk to branch 2.0 - bugs correction in
 upgrade_1.7.0.php. - only non-standard plugins are deactivated during
 upgrade.

git-svn-id: http://piwigo.org/svn/branches/2.0@2816 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 install/upgrade_1.7.0.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'install/upgrade_1.7.0.php')

diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php
index 85533dcfa..1b2b5abe1 100644
--- a/install/upgrade_1.7.0.php
+++ b/install/upgrade_1.7.0.php
@@ -33,7 +33,6 @@ else
   }
 }
 
-define('PREFIX_TABLE', $prefixeTable);
 define('UPGRADES_PATH', PHPWG_ROOT_PATH.'install/db');
 
 list($dbnow) = mysql_fetch_row(pwg_query('SELECT NOW();'));
@@ -68,15 +67,19 @@ foreach ($to_apply as $upgrade_id)
     array(
       'id' => $upgrade_id,
       'applied' => CURRENT_DATE,
-      'description' => '[migration from 1.7.0 to '.RELEASE.'] not applied',
+      'description' => '[migration from 1.7.0 to '.PHPWG_VERSION.'] not applied',
       )
     );
 }
-mass_inserts(
-  '`'.UPGRADE_TABLE.'`',
-  array_keys($inserts[0]),
-  $inserts
-  );
+
+if (!empty($inserts))
+{
+  mass_inserts(
+    '`'.UPGRADE_TABLE.'`',
+    array_keys($inserts[0]),
+    $inserts
+    );
+}
 
 // +-----------------------------------------------------------------------+
 // |                          Perform upgrades                             |
@@ -106,7 +109,7 @@ for ($upgrade_id = 61; ; $upgrade_id++)
 INSERT INTO `'.PREFIX_TABLE.'upgrade`
   (id, applied, description)
   VALUES
-  (\''.$upgrade_id.'\', NOW(), \'[migration from 1.7.0 to '.RELEASE.'] '.$upgrade_description.'\')
+  (\''.$upgrade_id.'\', NOW(), \'[migration from 1.7.0 to '.PHPWG_VERSION.'] '.$upgrade_description.'\')
 ;';
   pwg_query($query);
 }
-- 
cgit v1.2.3