Fix EZP-24135: Output buffer gets cleared after legacy call

Moved hasInstance() method from \eZ\Publish\Core\MVC\Legacy\Kernel to ezpKernel Use hasInstance() in eZScript Use hasInstance() in Kernel::instance() CS fix in Kernel::instance() (cherry picked from commit 97d6a72)
ezsystems · Apr 16, 2015 · eba0c2b · eba0c2b
1 parent 02b16e1
commit eba0c2b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/kernel/classes/ezscript.php b/kernel/classes/ezscript.php
@@ -235,8 +235,11 @@ function startup()
     */
     function initialize()
     {
-        if( ob_get_length() != 0 )
-            ob_end_clean();
+        if ( !ezpKernel::hasInstance() )
+        {
+            if ( ob_get_length() != 0 )
+                ob_end_clean();
+        }
 
         // Initialize text codec settings
         $this->updateTextCodecSettings();

diff --git a/kernel/private/classes/ezpkernel.php b/kernel/private/classes/ezpkernel.php
@@ -119,6 +119,16 @@ public function getServiceContainer()
         return $this->kernelHandler->getServiceContainer();
     }
 
+    /**
+     * Checks if the kernel has already been instantiated.
+     *
+     * @return bool
+     */
+    public static function hasInstance()
+    {
+        return self::$instance !== null;
+    }
+
     /**
      * Returns the current instance of ezpKernel.
      *
@@ -127,14 +137,15 @@ public function getServiceContainer()
      */
     public static function instance()
     {
-        if ( self::$instance === null )
+        if ( !self::hasInstance() )
         {
             throw new LogicException(
                 'Cannot return the instance of '
-                    . __CLASS__
-                    . ', it has not been instantiated'
+                . __CLASS__
+                . ', it has not been instantiated'
             );
         }
         return self::$instance;
     }
 }
+