Merge branch 'use-camelcase' of git://github.com/neeckeloo/zf2 into h…

…otfix/3362 Conflicts: library/Zend/Http/Client/Cookies.php library/Zend/Http/Cookies.php library/Zend/Soap/Wsdl.php
zendframework · Jan 7, 2013 · bcfe6a5 · bcfe6a5
commit bcfe6a5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Helper/HeadStyle.php b/src/Helper/HeadStyle.php
@@ -322,9 +322,9 @@ public function itemToString(stdClass $item, $indent)
                             continue;
                         }
                     } else {
-                        $media_types = explode(',', $value);
+                        $mediaTypes = explode(',', $value);
                         $value = '';
-                        foreach ($media_types as $type) {
+                        foreach ($mediaTypes as $type) {
                             $type = trim($type);
                             if (!in_array($type, $this->mediaTypes)) {
                                 continue;