Permalink
Browse files

Merge branch 'hotfix/ZF2-79' of https://github.com/thomasweidner/zf2

…into hotfix/file-decorator
  • Loading branch information...
2 parents 516155c + 861083c commit 0846d6b660cc1fdc2c6046161c0bf5bf1e97e169 @weierophinney weierophinney committed Oct 25, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 library/Zend/Form/Decorator/File.php
@@ -124,10 +124,10 @@ public function render($content)
for ($i = 0; $i < $count; ++$i) {
$htmlAttribs = $attribs;
$htmlAttribs['id'] .= '-' . $i;
- $markup[] = $view->formFile($name, null, $htmlAttribs);
+ $markup[] = $view->formFile($name, $htmlAttribs);
}
} else {
- $markup[] = $view->formFile($name, null, $attribs);
+ $markup[] = $view->formFile($name, $attribs);
}
$markup = implode($separator, $markup);

0 comments on commit 0846d6b

Please sign in to comment.