summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-10-30 10:25:52 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-10-30 10:26:00 +0100
commit4c390fa6b045d145fcc79efc9e77b06ff40df08c (patch)
treecc9ce68013317503f54c55058c25143630028da2
parentd03ec062f15125d84e369a39e66814253c02f5a1 (diff)
dont generate guid hash by hashing the guid since picofeed already hashes the guid in all cases
-rw-r--r--db/item.php4
-rw-r--r--tests/unit/db/ItemTest.php2
-rw-r--r--tests/unit/fetcher/FeedFetcherTest.php1
3 files changed, 4 insertions, 3 deletions
diff --git a/db/item.php b/db/item.php
index 8a8b19e59..452075d05 100644
--- a/db/item.php
+++ b/db/item.php
@@ -204,7 +204,9 @@ class Item extends Entity implements IAPI, \JsonSerializable {
public function setGuid($guid) {
parent::setGuid($guid);
- $this->setGuidHash(md5($guid));
+
+ // not needed to hash again because picofeed hashes the id anyways
+ $this->setGuidHash($guid);
}
diff --git a/tests/unit/db/ItemTest.php b/tests/unit/db/ItemTest.php
index 2739baabd..6d1a1d87a 100644
--- a/tests/unit/db/ItemTest.php
+++ b/tests/unit/db/ItemTest.php
@@ -263,7 +263,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase {
public function testSetGuidUpdatesHash() {
$item = new Item();
$item->setGuid('http://test');
- $this->assertEquals(md5('http://test'), $item->getGuidHash());
+ $this->assertEquals('http://test', $item->getGuidHash());
}
diff --git a/tests/unit/fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php
index ed697a8cf..fad468d7a 100644
--- a/tests/unit/fetcher/FeedFetcherTest.php
+++ b/tests/unit/fetcher/FeedFetcherTest.php
@@ -192,7 +192,6 @@ class FeedFetcherTest extends \PHPUnit_Framework_TestCase {
$item->setUrl($this->permalink);
$item->setTitle('my<\' title');
$item->setGuid($this->guid);
- $item->setGuidHash(md5($this->guid));
$item->setBody($this->body);
$item->setLastModified($this->time);