allow inserted urls again

4 files changed, 8 insertions, 8 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 393f25b21..e441ea558 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+owncloud-news (1.602)
+* Remove removed class from container
+* Go back to allow feeds per url from input
+
 owncloud-news (1.601)
 * Remove Google Reader import
 * Replace Google Reader import with export and import of unread and starred articles
diff --git a/db/feed.php b/db/feed.php
index 5e5bfcf5d..b59763c4d 100644
--- a/db/feed.php
+++ b/db/feed.php
@@ -72,6 +72,7 @@ class Feed extends Entity implements IAPI {
 		$url = trim($url);
 		if(strpos($url, 'http') === 0) {
 			parent::setUrl($url);
+			$this->setUrlHash(md5($url));
 		}
 	}
 
@@ -80,7 +81,6 @@ class Feed extends Entity implements IAPI {
 		$url = trim($url);
 		if(strpos($url, 'http') === 0) {
 			parent::setLink($url);
-			$this->setUrlHash(md5($url));
 		}
 	}
 
diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php
index da9326dd4..0a3226b98 100644
--- a/tests/unit/db/FeedTest.php
+++ b/tests/unit/db/FeedTest.php
@@ -62,9 +62,9 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
-	public function testSetLinkUpdatesHash() {
+	public function testSetUrlUpdatesHash() {
 		$feed = new Feed();
-		$feed->setLink('http://test');
+		$feed->setUrl('http://test');
 		$this->assertEquals(md5('http://test'), $feed->getUrlHash());
 	}
 
diff --git a/tests/unit/utility/FeedFetcherTest.php b/tests/unit/utility/FeedFetcherTest.php
index af9de69e5..7bbf54371 100644
--- a/tests/unit/utility/FeedFetcherTest.php
+++ b/tests/unit/utility/FeedFetcherTest.php
@@ -101,7 +101,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 						 $this->cacheDuration,
 						 $this->fetchTimeout,
 						 $this->purifier);
-		$this->url = 'tests';
+		$this->url = 'http://tests';
 
 		$this->permalink = 'http://permalink';
 		$this->title = 'my title<';
@@ -242,7 +242,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setTitle(html_entity_decode($this->feedTitle));
 		$feed->setUrl($this->url);
 		$feed->setLink($this->feedLink);
-		$feed->setUrlHash(md5($this->feedLink));
 		$feed->setAdded($this->time);
 
 		if($hasWebFavicon) {
@@ -287,7 +286,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setTitle($this->url);
 		$feed->setUrl($this->url);
 		$feed->setLink($this->feedLink);
-		$feed->setUrlHash(md5($this->feedLink));
 		$feed->setAdded($this->time);
 		$feed->setFaviconLink(null);
 
@@ -348,7 +346,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setTitle(html_entity_decode($this->feedTitle));
 		$feed->setUrl($this->url);
 		$feed->setLink($this->feedLink);
-		$feed->setUrlHash(md5($this->feedLink));
 		$feed->setAdded($this->time);
 		$feed->setFaviconLink($this->webFavicon);
 
@@ -375,7 +372,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setTitle(html_entity_decode($this->feedTitle));
 		$feed->setUrl($this->url);
 		$feed->setLink($this->feedLink);
-		$feed->setUrlHash(md5($this->feedLink));
 		$feed->setAdded($this->time);
 
 		$this->core->expects($this->once())