EZP-22152: Fixed debug of legacy templates list when not in pure web …

…context
ezsystems · Jan 30, 2014 · 2b27571 · 2b27571
1 parent ca46bd3
commit 2b27571
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/eZ/Bundle/EzPublishDebugBundle/Collector/TemplateDebugInfo.php b/eZ/Bundle/EzPublishDebugBundle/Collector/TemplateDebugInfo.php
@@ -11,6 +11,7 @@
 
 use eZ\Publish\Core\MVC\Legacy\Kernel as LegacyKernel;
 use eZTemplate;
+use RuntimeException;
 
 /**
  * Class TemplateDebugInfo
@@ -77,12 +78,20 @@ public static function getLegacyTemplatesList( \Closure $legacyKernel )
             return $templateList;
         }
 
-        $templateStats = $legacyKernel()->runCallback(
-            function ()
-            {
-                return eZTemplate::templatesUsageStatistics();
-            }
-        );
+        try
+        {
+            $templateStats = $legacyKernel()->runCallback(
+                function ()
+                {
+                    return eZTemplate::templatesUsageStatistics();
+                }
+            );
+        }
+        catch ( RuntimeException $e )
+        {
+            // Ignore the exception thrown by legacy kernel as this would break debug toolbar (and thus debug info display).
+            // Furthermore, some legacy kernel handlers don't support runCallback (e.g. ezpKernelTreeMenu)
+        }
 
         foreach ( $templateStats as $tplInfo )
         {

diff --git a/eZ/Publish/Core/MVC/Legacy/Kernel/Loader.php b/eZ/Publish/Core/MVC/Legacy/Kernel/Loader.php
@@ -73,19 +73,20 @@ public function buildLegacyKernel( $legacyKernelHandler )
         $eventDispatcher = $this->eventDispatcher;
         return function () use ( $legacyKernelHandler, $legacyRootDir, $webrootDir, $eventDispatcher )
         {
-            static $legacyKernel;
-            if ( !$legacyKernel instanceof LegacyKernel )
+            if ( LegacyKernel::hasInstance() )
             {
-                if ( $legacyKernelHandler instanceof \Closure )
-                    $legacyKernelHandler = $legacyKernelHandler();
-                $legacyKernel = new LegacyKernel( $legacyKernelHandler, $legacyRootDir, $webrootDir );
-
-                $eventDispatcher->dispatch(
-                    LegacyEvents::POST_BUILD_LEGACY_KERNEL,
-                    new PostBuildKernelEvent( $legacyKernel, $legacyKernelHandler )
-                );
+                return LegacyKernel::instance();
             }
 
+            if ( $legacyKernelHandler instanceof \Closure )
+                $legacyKernelHandler = $legacyKernelHandler();
+            $legacyKernel = new LegacyKernel( $legacyKernelHandler, $legacyRootDir, $webrootDir );
+
+            $eventDispatcher->dispatch(
+                LegacyEvents::POST_BUILD_LEGACY_KERNEL,
+                new PostBuildKernelEvent( $legacyKernel, $legacyKernelHandler )
+            );
+
             return $legacyKernel;
         };
     }