Merge branch 'core-1.0.0' into core

diff --git a/classes/plwikipage.php b/classes/plwikipage.php
index 6f28191..787b293 100644 (file)
--- a/classes/plwikipage.php
+++ b/classes/plwikipage.php
@@ -64,6 +64,18 @@ class PlWikiPage
         return self::workDir() . '/cache_' . $this->name . '.tpl';
     }
 
+    /** Remove the cache for the current page.
+     */
+    public function removePageCache()
+    {
+        @unlink($this->cacheFilename());
+        global $globals;
+        $page = glob($globals->spoolroot . '/spool/templates_c/*cache_' . $this->name . '.tpl.php');
+        if (count($page) > 0) {
+            @unlink($page[0]);
+        }
+    }
+
     /** Fetch the content of the wiki page.
      */
     private function fetchContent()

diff --git a/include/wiki.engine.inc.php b/include/wiki.engine.inc.php
index fe72475..ae32040 100644 (file)
--- a/include/wiki.engine.inc.php
+++ b/include/wiki.engine.inc.php
@@ -59,7 +59,8 @@ $wiki_cache   = $wp->cacheFilename();
 $cache_exists = file_exists($wiki_cache);
 if (Env::v('action') || !$cache_exists) {
     if ($cache_exists && !$feed) {
-        unlink($wiki_cache);
+        $wp->removePageCache();
+        $cache_exists = false;
     }
 
     // we leave pmwiki do whatever it wants and store everything