浏览代码

simplified code

Fabien Potencier 14 年之前
父节点
当前提交
b32a7e935a

+ 0 - 4
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/ActionsHelper.php

@@ -46,10 +46,6 @@ class ActionsHelper extends Helper
     {
         $options['attributes'] = $attributes;
 
-        if (isset($options['query'])) {
-            $options['query'] = $options['query'];
-        }
-
         return $this->kernel->render($controller, $options);
     }
 

+ 2 - 2
src/Symfony/Component/HttpKernel/Kernel.php

@@ -192,9 +192,9 @@ abstract class Kernel implements KernelInterface
 
         if (true === $first) {
             return $this->bundleMap[$name][0];
-        } elseif (false === $first) {
-            return $this->bundleMap[$name];
         }
+
+        return $this->bundleMap[$name];
     }
 
     /**