Reverted the feature to display different toolbar versions

javiereguiluz · javiereguiluz · commit 7ec1cd491da1 · 2015-07-30T09:29:46.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -28,9 +28,6 @@
  */
 class ProfilerController
 {
-    const TOOLBAR_VERSION_1 = 1;
-    const TOOLBAR_VERSION_2 = 2;
-
     private $templateManager;
     private $generator;
     private $profiler;
@@ -205,15 +202,12 @@ public function toolbarAction(Request $request, $token)
             // the profiler is not enabled
         }
 
-        $toolbarVersion = Kernel::VERSION_ID < 20800 ? self::TOOLBAR_VERSION_1 : self::TOOLBAR_VERSION_2;
-
         return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
             'position' => $position,
             'profile' => $profile,
             'templates' => $this->getTemplateManager()->getTemplates($profile),
             'profiler_url' => $url,
             'token' => $token,
-            'toolbar_version' => $toolbarVersion,
         )), 200, array('Content-Type' => 'text/html'));
     }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@@ -30,8 +30,7 @@
             'collector': profile.getcollector(name),
             'profiler_url': profiler_url,
             'token': profile.token,
-            'name': name,
-            'toolbar_version': toolbar_version
+            'name': name
           })
         }}
     {% endfor %}
