Merge pull request zendframework#461 from Nazin/master

CDATA section for category elements in RSS feed

Author: froschdesign

library/Zend/Feed/Rss.php

@@ -433,7 +433,8 @@ protected function _mapFeedEntries(DOMElement $root, $array)
 
             if (isset($dataentry->category)) {
                 foreach ($dataentry->category as $category) {
-                    $node = $this->_element->createElement('category', $category['term']);
+                    $node = $this->_element->createElement('category');
+                    $node->appendChild($this->_element->createCDATASection($category['term']));
                     if (isset($category['scheme'])) {
                         $node->setAttribute('domain', $category['scheme']);
                     }

tests/Zend/Feed/Writer/Renderer/Entry/RssTest.php

@@ -367,4 +367,17 @@ public function testCategoriesCharDataEncoding()
         $this->assertEquals($expected, (array) $entry->getCategories());
     }
 
+    /**
+     * @group GH-461
+     */
+    public function testCategoryHasCDataSection()
+    {
+        $this->_validEntry->addCategory(array(
+            'term' => 'This is a test category',
+        ));
+        $renderer = new Zend_Feed_Writer_Renderer_Feed_Rss($this->_validWriter);
+        $xmlString = $renderer->render()->saveXml();
+        $this->assertContains('<category><![CDATA[This is a test category]]></category>', $xmlString);
+    }
+
 }