diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-07-11 10:14:08 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-12-18 14:50:04 +0100 |
commit | dfa18939e87c4e8f8f61124f3fcf6ae3f36fc44c (patch) | |
tree | 62433d759b5db39c354ba5bc2df3256ad2024d83 | |
parent | c1c0f09949c85218b720280d84eca70dad51b65a (diff) | |
download | wallabag-dfa18939e87c4e8f8f61124f3fcf6ae3f36fc44c.tar.gz wallabag-dfa18939e87c4e8f8f61124f3fcf6ae3f36fc44c.tar.zst wallabag-dfa18939e87c4e8f8f61124f3fcf6ae3f36fc44c.zip |
Fixed review
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 1 | ||||
-rw-r--r-- | tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3ac0f8a6..b7fdea27 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -78,7 +78,6 @@ class EntryController extends Controller | |||
78 | return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()])); | 78 | return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()])); |
79 | } | 79 | } |
80 | 80 | ||
81 | $entry->setGivenUrl($entry->getUrl()); | ||
82 | $this->updateEntry($entry); | 81 | $this->updateEntry($entry); |
83 | 82 | ||
84 | $em = $this->getDoctrine()->getManager(); | 83 | $em = $this->getDoctrine()->getManager(); |
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index fe795d42..48b5dfbc 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -65,6 +65,7 @@ class ContentProxy | |||
65 | // so we'll be able to refetch it in the future | 65 | // so we'll be able to refetch it in the future |
66 | $content['url'] = !empty($content['url']) ? $content['url'] : $url; | 66 | $content['url'] = !empty($content['url']) ? $content['url'] : $url; |
67 | 67 | ||
68 | $entry->setGivenUrl($url); | ||
68 | $this->stockEntry($entry, $content); | 69 | $this->stockEntry($entry, $content); |
69 | } | 70 | } |
70 | 71 | ||
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index cd63c1ba..20acd103 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | |||
@@ -270,7 +270,7 @@ class EntryControllerTest extends WallabagCoreTestCase | |||
270 | $this->logInAs('admin'); | 270 | $this->logInAs('admin'); |
271 | $client = $this->getClient(); | 271 | $client = $this->getClient(); |
272 | 272 | ||
273 | $url = 'https://fashionunited.com/news/business/jigsaw-posts-8-percent-increase-in-annual-sales/2017070316404'; | 273 | $url = 'http://bit.ly/2t8Fwre'; |
274 | 274 | ||
275 | $crawler = $client->request('GET', '/new'); | 275 | $crawler = $client->request('GET', '/new'); |
276 | 276 | ||