Correct usage of ob_end_clean and ob_get_contents

gkwyc · Jun 18, 2012 · 4886150 · 4886150
1 parent ded256c
commit 4886150
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
@@ -288,7 +288,8 @@ public function getDispErrors()
                 } else {
                     ob_start();
                     var_dump($error);
-                    $retval .= ob_end_clean();
+                    $retval .= ob_get_contents();
+                    ob_end_clean();
                 }
             }
         } else {

diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php
@@ -172,7 +172,8 @@ private function _getDebugMessage()
 
             ob_start();
             print_r($_SESSION['debug']);
-            $retval .= ob_end_clean();
+            $retval .= ob_get_contents();
+            ob_end_clean();
 
             $retval .= '</pre>';
             $retval .= '</div>';
@@ -322,7 +323,8 @@ public function getDisplay()
                 if (file_exists(CUSTOM_FOOTER_FILE)) {
                     ob_start();
                     include CUSTOM_FOOTER_FILE;
-                    $retval .= ob_end_clean();
+                    $retval .= ob_get_contents();
+                    ob_end_clean();
                 }
             } else if (! $this->_isAjax) {
                 $retval .= "</body></html>";

diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -297,7 +297,8 @@ public function getDisplay()
                 if (file_exists(CUSTOM_HEADER_FILE)) {
                     ob_start();
                     include CUSTOM_HEADER_FILE;
-                    $retval .= ob_end_clean();
+                    $retval .= ob_get_contents();
+                    ob_end_clean();
                 }
                 // offer to load user preferences from localStorage
                 if ($this->_userprefsOfferImport) {