From 4252ce01ae53e35177bdf404ce81d01d9677a9ca Mon Sep 17 00:00:00 2001
From: Kevin Fourie <kevin@knowledgetree.com>
Date: Thu, 31 Jan 2008 10:59:49 +0000
Subject: [PATCH] KTS-2799 "3.5.2 beta 2 upgrade error" Updated. Removed re-read plugins from the upgrade.php and added a persistent actions method. This needs to be done properly if it works.

---
 setup/upgrade.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/setup/upgrade.php b/setup/upgrade.php
index a926276..56aa674 100644
--- a/setup/upgrade.php
+++ b/setup/upgrade.php
@@ -119,8 +119,21 @@ function performAllUpgrades () {
 			break;
 		}
 	}
-	KTPluginUtil::registerPlugins();
-	return $res;
+	
+    return $res;
+}
+
+function performPersistentActions() {
+    
+    // This is just to test and needs to be updated to a more sane and error resistent architrcture if it works.
+    // It should idealy work the same as the upgrades.
+    
+    // Clean out the plugin_helper table
+    $sql = "DELETE FROM plugin_helper";
+    $res = DBUtil::runQuery($sql);
+
+    return $res;
+
 }
 
 function failWritablePath($name, $path) {
@@ -1051,7 +1064,8 @@ function Upgrade()
  
   <?php
 	$res = performAllUpgrades();
-	if (PEAR::isError($res)) 
+    $pres = performPersistentActions();
+	if (PEAR::isError($res) || PEAR::isError($pres)) 
 	{
 ?>
 <font color="red">Upgrade failed.</font>
--
libgit2 0.21.4