Changeset 812 for trunk/includes

Timestamp:

May 31, 2014, 9:35:15 AM (11 years ago)

Author:

chronos

Message:

• Fixed: "Page not found" was not handled correctly. It was handled incorrectly by Redirection module.

Location:

trunk/includes

Files:

• Version.php (modified) (1 diff)
• system.php (modified) (1 diff)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 811; // Subversion revision
+$Revision = 812; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2014-05-28';
+$ReleaseTime = '2014-05-31';

trunk/includes/system.php

@@ -247 +247 @@
       if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
     } else {
+      $Output2 = '';
         if((count($this->OnPageNotFound) == 2)
   and method_exists($this->OnPageNotFound[0], $this->OnPageNotFound[1]))
-          $Output = $this->BaseView->ShowPage(call_user_func_array($this->OnPageNotFound, array()));
-                else
-                {
+          $Output2 = call_user_func_array($this->OnPageNotFound, array());
+     if($Output2 != '') $Output .= $this->BaseView->ShowPage($Output2);
+                else {
                         $Output = $this->PageNotFound();
-            $this->BaseView->Title = T('Page not found');
-                $Output = $this->BaseView->ShowPage($Output);
+          $this->BaseView->Title = T('Page not found');
+        $Output = $this->BaseView->ShowPage($Output);
                 }
         }