소스 검색

[Routing] fixed previous merge

Fabien Potencier 14 년 전
부모
커밋
9aa8083cb4
1개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 5 4
      src/Symfony/Component/Routing/Loader/XmlFileLoader.php

+ 5 - 4
src/Symfony/Component/Routing/Loader/XmlFileLoader.php

@@ -48,7 +48,7 @@ class XmlFileLoader extends FileLoader
                 continue;
             }
 
-            $this->parseNode($collection, $node, $path);
+            $this->parseNode($collection, $node, $path, $file);
         }
 
         return $collection;
@@ -58,10 +58,11 @@ class XmlFileLoader extends FileLoader
      * Parses a node from a loaded XML file.
      *
      * @param RouteCollection $collection the collection to associate with the node
-     * @param DOMElement $node the node to parse
-     * @param string $path the path of the XML file being processed
+     * @param DOMElement      $node the node to parse
+     * @param string          $path the path of the XML file being processed
+     * @param string          $file
      */
-    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path)
+    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path, $file)
     {
         switch ($node->tagName) {
             case 'route':