Merge remote-tracking branch 'basz/hotfix/zf2-349'

zendframework · Jun 13, 2012 · eb2029b · eb2029b
8 parents 3a2cf9b + 192d20c + d2649e3 + f0162d1 + 6f01416 + a2b3753 + 1786961 + a000795
commit eb2029b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Helper/HeadScript.php b/src/Helper/HeadScript.php
@@ -408,8 +408,7 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
         $attrString = '';
         if (!empty($item->attributes)) {
             foreach ($item->attributes as $key => $value) {
-                if ((!$this->arbitraryAttributesAllowed()
-                    && !in_array($key, $this->_optionalAttributes)) 
+                if ((!$this->arbitraryAttributesAllowed() && !in_array($key, $this->_optionalAttributes)) 
                     || in_array($key, array('conditional', 'noescape')))
                 {
                     continue;