Merge branch 'hotfix/3126' into develop

Forward port zendframework/zendframework#3126
zendframework · Dec 11, 2012 · b4cdf4e · b4cdf4e
commit b4cdf4e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/Writer/Extension/Atom/Renderer/Feed.php b/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -76,12 +76,14 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
             return;
         }
         foreach ($flinks as $type => $href) {
-            $mime  = 'application/' . strtolower($type) . '+xml';
-            $flink = $dom->createElement('atom:link');
-            $root->appendChild($flink);
-            $flink->setAttribute('rel', 'self');
-            $flink->setAttribute('type', $mime);
-            $flink->setAttribute('href', $href);
+            if (strtolower($type) == $this->getType()) { // issue 2605
+                $mime  = 'application/' . strtolower($type) . '+xml';
+                $flink = $dom->createElement('atom:link');
+                $root->appendChild($flink);
+                $flink->setAttribute('rel', 'self');
+                $flink->setAttribute('type', $mime);
+                $flink->setAttribute('href', $href);
+            }
         }
         $this->called = true;
     }

diff --git a/test/Writer/Renderer/Feed/RssTest.php b/test/Writer/Renderer/Feed/RssTest.php
@@ -224,6 +224,21 @@ public function testFeedLinkToHtmlVersionOfFeedIfMissingThrowsException()
         $rssFeed->render();
     }
 
+    /**
+     * @group Issue2605
+     */
+    public function testFeedIncludesLinkToXmlRssWhereRssAndAtomLinksAreProvided()
+    {
+        $this->validWriter->setFeedLink('http://www.example.com/rss', 'rss');
+        $this->validWriter->setFeedLink('http://www.example.com/atom', 'atom');
+        $rssFeed = new Renderer\Feed\Rss($this->validWriter);
+        $rssFeed->render();
+        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $this->assertEquals('http://www.example.com/rss', $feed->getFeedLink());
+        $xpath = new \DOMXPath($feed->getDomDocument());
+        $this->assertEquals(1, $xpath->evaluate('/rss/channel/atom:link[@rel="self"]')->length);
+    }
+
     public function testFeedIncludesLinkToXmlRssWhereTheFeedWillBeAvailable()
     {
         $this->validWriter->setFeedLink('http://www.example.com/rss', 'rss');