Merge branch 'hotfix/2398'

Close #2398
zendframework · Sep 21, 2012 · b24353e · b24353e
2 parents 284985f + 616c099
commit b24353e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/library/Zend/Mvc/Router/Http/Segment.php b/library/Zend/Mvc/Router/Http/Segment.php
@@ -273,7 +273,7 @@ protected function buildPath(array $parts, array $mergedParams, $isOptional, $ha
                     $skippable    = true;
                     $optionalPart = $this->buildPath($part[1], $mergedParams, true, $hasChild);
 
-                    if ($optionalPart !== null) {
+                    if ($optionalPart !== '') {
                         $path .= $optionalPart;
                         $skip  = false;
                     }

diff --git a/tests/ZendTest/Mvc/Router/Http/SegmentTest.php b/tests/ZendTest/Mvc/Router/Http/SegmentTest.php
@@ -111,6 +111,12 @@ public static function routeProvider()
                 null,
                 array('foo' => 'bar', 'bar' => 'baz')
             ),
+            'optional-group-within-optional-group-is-ignored' => array(
+                new Segment('/:foo[/:bar[/:baz]]', array(), array('bar' => 'baz', 'baz' => 'bat')),
+                '/bar',
+                null,
+                array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'bat')
+            ),
             'non-standard-delimiter-before-parameter' => array(
                 new Segment('/foo-:bar'),
                 '/foo-baz',