[geeklog-hg] geeklog: Fixed install issue where topic tree cache file could n...

[geeklog-cvs at lists.geeklog.net]

changeset 9318:0300e7cb89b4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0300e7cb89b4
user: Tom <websitemaster at cogeco.net>
date: Thu Oct 10 17:46:30 2013 -0400
description:
Fixed install issue where topic tree cache file could not be written because the config values have not been set. Also fix cache being cleared multiple times in install/ upgrade (bug #0001702)

diffstat:

 public_html/admin/install/index.php |  7 ++++---
 public_html/lib-common.php          |  7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r b8b2056ae537 -r 0300e7cb89b4 public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Tue Oct 01 07:25:11 2013 -0400
+++ b/public_html/admin/install/index.php	Thu Oct 10 17:46:30 2013 -0400
@@ -645,6 +645,10 @@
                 }
                 break;
         }
+        
+        // Clear the Geeklog Cache        
+        INST_clearCache();
+
         break;
 
     /**
@@ -1318,9 +1322,6 @@
         // Run the installation function
         INST_installEngine($mode, $step); 
 
-        // Clear the Geeklog Cache        
-        INST_clearCache();
-
         break;
 
     } // End switch ($mode)
diff -r b8b2056ae537 -r 0300e7cb89b4 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Oct 01 07:25:11 2013 -0400
+++ b/public_html/lib-common.php	Thu Oct 10 17:46:30 2013 -0400
@@ -526,8 +526,11 @@
 if (empty($serialized_topic_tree)) {
     $_TOPICS = TOPIC_buildTree(TOPIC_ROOT, true);
 
-    // Save updated topic tree and date
-    CACHE_create_instance($cacheInstance, serialize($_TOPICS), true);
+    // Need this check since this variable is not set correctly when Geeklog is being install
+    if (isset($GLOBALS['TEMPLATE_OPTIONS']) && is_array($TEMPLATE_OPTIONS) && isset($TEMPLATE_OPTIONS['path_cache'])) { 
+        // Save updated topic tree and date
+        CACHE_create_instance($cacheInstance, serialize($_TOPICS), true);
+    }
 } else {
     $_TOPICS = unserialize($serialized_topic_tree);
 }