Backports

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1446 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/classes/plmailer.php b/classes/plmailer.php
index f66ac89..9468fa3 100644 (file)
--- a/classes/plmailer.php
+++ b/classes/plmailer.php
@@ -264,7 +264,10 @@ class PlMailer extends Mail_Mime {
         foreach(Array('To', 'Cc', 'Bcc') as $hdr) {
             if(isset($this->_headers[$hdr])) {
                 require_once 'Mail/RFC822.php';
-                $addrs = array_merge($addrs, @Mail_RFC822::parseAddressList($this->_headers[$hdr]));
+                $parsed = @Mail_RFC822::parseAddressList($this->_headers[$hdr]);
+                if (is_array($parsed)) {
+                    $addrs = array_merge($addrs, $parsed);
+                }
             }
         }
         if(empty($addrs)) {

diff --git a/include/wiki/engine.php b/include/wiki/engine.php
index 8455e44..22bdbb8 100644 (file)
--- a/include/wiki/engine.php
+++ b/include/wiki/engine.php
@@ -66,6 +66,10 @@ $cache_exists = file_exists($wiki_cache);
 if (Env::v('action') || !$cache_exists) {
     if ($cache_exists) {
         unlink($wiki_cache);
+        $files = glob($globals->spoolroot . '/spool/templates_c/*cache_' . wiki_filename($n) . '.tpl*');
+        foreach ($files as $file) {
+            unlink($file);
+        }
     }
 
     // we leave pmwiki do whatever it wants and store everything