Просмотр исходного кода

ZF-8056
added a trim()-call to get rid of extra whitespace

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18571 44c647ce-9c0f-0410-b52a-842ac1e357ba

sgehrig 16 лет назад
Родитель
Сommit
35a4ec288d
2 измененных файлов с 11 добавлено и 0 удалено
  1. 1 0
      library/Zend/View/Helper/HeadStyle.php
  2. 10 0
      tests/Zend/View/Helper/HeadStyleTest.php

+ 1 - 0
library/Zend/View/Helper/HeadStyle.php

@@ -324,6 +324,7 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_
                         $media_types = explode(',', $value);
                         $value = '';
                         foreach($media_types as $type) {
+                            $type = trim($type);
                             if (!in_array($type, $this->_mediaTypes)) {
                                 continue;
                             }

+ 10 - 0
tests/Zend/View/Helper/HeadStyleTest.php

@@ -239,6 +239,16 @@ class Zend_View_Helper_HeadStyleTest extends PHPUnit_Framework_TestCase
         $this->assertRegexp('#<style [^>]*?media="screen"#', $value, $value);
     }
 
+    /**
+     * @group ZF-8056
+     */
+    public function testMediaAttributeCanHaveSpaceInCommaSeparatedString()
+    {
+        $this->helper->appendStyle('a { }', array('media' => 'screen, projection'));
+        $string = $this->helper->toString();
+        $this->assertContains('media="screen,projection"', $string);
+    }
+
     public function testHeadStyleProxiesProperly()
     {
         $style1 = 'a {}';