More merge mess up fixes

diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php
index b0aa5764e9329070f6399797ae1a3d24b846206c..1c9812a42376c6281b2205e6297044f07fd70d41 100644 (file)
--- a/application/FeedBuilder.php
+++ b/application/FeedBuilder.php
@@ -125,7 +125,7 @@ class FeedBuilder
         $data['show_dates'] = !$this->hideDates || $this->isLoggedIn;
         // Remove leading slash from REQUEST_URI.
         $data['self_link'] = escape(server_url($this->serverInfo))
-                           . escape($this->serverInfo['REQUEST_URI']);
+            . escape($this->serverInfo['REQUEST_URI']);
         $data['index_url'] = $pageaddr;
         $data['usepermalinks'] = $this->usePermalinks === true;
         $data['links'] = $linkDisplayed;
@@ -143,7 +143,7 @@ class FeedBuilder
      */
     protected function buildItem($link, $pageaddr)
     {
-        $link['guid'] = $pageaddr .'?'. smallHash($link['linkdate']);
+        $link['guid'] = $pageaddr .'?'. $link['shorturl'];
         // Check for both signs of a note: starting with ? and 7 chars long.
         if ($link['url'][0] === '?' && strlen($link['url']) === 7) {
             $link['url'] = $pageaddr . $link['url'];

diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index 4a67b2dc8566b86c6becd7e4feab9bcbf84e8fed..17ef228031331fba63fbb5ef567a3fc1fa06c04c 100644 (file)
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -185,17 +185,4 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
         $data = process_markdown($md);
         $this->assertEquals($html, $data);
     }
-
-    /**
-     * Test hashtag links processed with markdown.
-     */
-    function testMarkdownHashtagLinks()
-    {
-        $md = file_get_contents('tests/plugins/resources/markdown.md');
-        $md = format_description($md);
-        $html = file_get_contents('tests/plugins/resources/markdown.html');
-
-        $data = process_markdown($md);
-        $this->assertEquals($html, $data);
-    }
 }