Merge pull request #3 from KillermenBE/master

Changed guid
dereuromark · Feb 25, 2016 · 292554d · 292554d
2 parents b603eda + 1b870dd
commit 292554d
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/src/View/RssView.php b/src/View/RssView.php
@@ -310,7 +310,9 @@ protected function _prepareOutput($item) {
 						}
 						$val = $attrib;
 					} elseif (is_array($val) && isset($val['url'])) {
-						$val['url'] = Router::url($val['url'], true);
+						if (!isset($val['@isPermalink']) || $val['@isPermalink'] !== 'false') {
+							$val['url'] = Router::url($val['url'], true);
+						}
 						if ($bareKey === 'guid') {
 							$val['@'] = $val['url'];
 							unset($val['url']);

diff --git a/tests/TestCase/View/RssViewTest.php b/tests/TestCase/View/RssViewTest.php
@@ -645,6 +645,54 @@ public function testMedia() {
   </channel>
 </rss>
 
+RSS;
+		$this->assertTextEquals($expected, $result);
+	}
+
+	public function testIsPermalink() {
+		$Request = new Request();
+		$Response = new Response();
+
+		$data = [
+			'channel' => [
+				'title' => 'Channel title',
+			],
+			'items' => [
+				[
+					'guid' => ['url' => 'Testing', '@isPermalink' => 'false'],
+				],
+				[
+					'guid' => ['url' => 'Testing', '@isPermalink' => 'true'],
+				],
+				[
+					'guid' => ['url' => 'Testing'],
+				],
+			]
+		];
+
+		$viewVars = ['channel' => $data, '_serialize' => 'channel'];
+		$View = new RssView($Request, $Response, null, ['viewVars' => $viewVars]);
+		$result = $View->render(false);
+
+		$expected = <<<RSS
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0">
+  <channel>
+    <title>Channel title</title>
+    <link>/</link>
+    <description/>
+    <item>
+      <guid isPermalink="false">Testing</guid>
+    </item>
+    <item>
+      <guid isPermalink="true">/Testing</guid>
+    </item>
+    <item>
+      <guid>/Testing</guid>
+    </item>
+  </channel>
+</rss>
+
 RSS;
 		$this->assertTextEquals($expected, $result);
 	}