From d05703b05dc63829b4f8ef2f0145a4fe0045c582 Mon Sep 17 00:00:00 2001
From: donald_jackson <donald_jackson@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Wed, 10 Dec 2008 12:51:07 +0000
Subject: [PATCH] "Fatal error after having updated and reread the plugins a few times on Windows XP and Windows Vista." KTC-649 Plugins were being re-read 'twice' causing havoc with the plugin registry, have implemented a super global parameter to re-read plugins before any other activity takes place.

---
 lib/plugins/pluginutil.inc.php       | 2 +-
 plugins/ktcore/admin/plugins.php     | 6 +++++-
 templates/ktcore/plugins/list.smarty | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/pluginutil.inc.php b/lib/plugins/pluginutil.inc.php
index 7d6d66b..4c35235 100644
--- a/lib/plugins/pluginutil.inc.php
+++ b/lib/plugins/pluginutil.inc.php
@@ -180,7 +180,7 @@ class KTPluginUtil {
         }
 
         // Check that there are plugins and if not, register them
-        if (empty($aPluginHelpers)) {
+        if (empty($aPluginHelpers) || (isset($_POST['_force_plugin_truncate']))) {
             DBUtil::startTransaction();
             KTPluginUtil::registerPlugins();
             DBUtil::commit();
diff --git a/plugins/ktcore/admin/plugins.php b/plugins/ktcore/admin/plugins.php
index e31fc69..535d745 100755
--- a/plugins/ktcore/admin/plugins.php
+++ b/plugins/ktcore/admin/plugins.php
@@ -154,7 +154,11 @@ class KTPluginDispatcher extends KTAdminDispatcher {
     }
 
     function do_reread() {
-        KTPluginUtil::registerPlugins();
+        /**
+         * The plugin re-register is now handled by the super global _force_plugin_truncate
+         * in pluginutil.inc.php
+         * KTPluginUtil::registerPlugins();
+        */
         $this->successRedirectToMain(_kt('Plugins read from the filesystem'));
     }
 }
diff --git a/templates/ktcore/plugins/list.smarty b/templates/ktcore/plugins/list.smarty
index 8d992aa..fed6cb2 100644
--- a/templates/ktcore/plugins/list.smarty
+++ b/templates/ktcore/plugins/list.smarty
@@ -21,6 +21,7 @@ must be re-read from the filesystem{/i18n}</p>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="reread" />
+<input type="hidden" name="_force_plugin_truncate" value="1" />
 <input type="submit" name="submit" value="{i18n}Reread plugins{/i18n}" />
 </form>
 
--
libgit2 0.21.4