[phpwiki-checkins] SF.net SVN: phpwiki:[8064] trunk/lib/MailNotify.php

[<var...@us...>]

Revision: 8064
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8064&view=rev
Author:   vargenau
Date:     2011-05-04 10:23:50 +0000 (Wed, 04 May 2011)

Log Message:
-----------
ErrorHandler->_postponed_errors --> ErrorManager->_postponed_errors

Modified Paths:
--------------
    trunk/lib/MailNotify.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2011-05-04 10:22:51 UTC (rev 8063)
+++ trunk/lib/MailNotify.php	2011-05-04 10:23:50 UTC (rev 8064)
@@ -204,14 +204,15 @@
            $headers
            );
     if (MAILER_LOG and is_writable(MAILER_LOG)) {
+        global $ErrorManager;
+
         $f = fopen(MAILER_LOG, "a");
         fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
-        if (!$ok) {
-        global $ErrorManager;
-        // get last error message
-        $last_err =
-                    $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
-        fwrite($f, "\nX-MailFailure: " . $last_err);
+
+        if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
+            // get last error message
+            $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
+            fwrite($f, "\nX-MailFailure: " . $last_err);
         }
         fwrite($f, "\nDate: " . CTime());
         fwrite($f, "\nSubject: $encoded_subject");
@@ -246,7 +247,7 @@
 
         global $request;
 
-        if (@is_array($request->_deferredPageChangeNotification)) {
+        if (isset($request->_deferredPageChangeNotification)) {
             // collapse multiple changes (loaddir) into one email
             $request->_deferredPageChangeNotification[] =
                 array($this->pagename, $this->emails, $this->userids);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.