Merge pull request #23 from Flyingmana/Flyingmana-patch-1

prevent HEADERS ALREADY SENT error
OpenMage · Oct 25, 2016 · b754092 · b754092
2 parents c7cf38b + 634ec5c
commit b754092
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
@@ -186,9 +186,12 @@ public function thumbnailAction()
         $file = Mage::helper('cms/wysiwyg_images')->idDecode($file);
         $thumb = $this->getStorage()->resizeOnTheFly($file);
         if ($thumb !== false) {
+            ob_start();
             $image = Varien_Image_Adapter::factory('GD2');
             $image->open($thumb);
             $image->display();
+            $this->getResponse()->setHeader('Content-type', $image->getMimeType(), true);
+            $this->getResponse()->setBody(ob_get_clean());
         } else {
             // todo: genearte some placeholder
         }

diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/WysiwygController.php
@@ -43,6 +43,7 @@ public function directiveAction()
         $directive = $this->getRequest()->getParam('___directive');
         $directive = Mage::helper('core')->urlDecode($directive);
         $url = Mage::getModel('cms/adminhtml_template_filter')->filter($directive);
+        ob_start();
         try {
             $image = Varien_Image_Adapter::factory('GD2');
             $image->open($url);
@@ -62,6 +63,8 @@ public function directiveAction()
             imagedestroy($image);
             */
         }
+        $this->getResponse()->setHeader('Content-type', $image->getMimeType(), true);
+        $this->getResponse()->setBody(ob_get_clean());
     }
 
     /**