diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-09-11 20:17:42 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-09-11 20:17:42 +0200 |
commit | 9c08a891f9bb90bc3f23a575a734283c1ee00ba1 (patch) | |
tree | f5e90765bdd2b923cbd008722e12be25028bdf6d /src/Wallabag/CoreBundle/Controller | |
parent | 49e564ec159371d9fa751ba75f9f1c555d108179 (diff) | |
parent | f1e29e69cb0ba5a0f05190c62e7a4afd43d03436 (diff) | |
download | wallabag-9c08a891f9bb90bc3f23a575a734283c1ee00ba1.tar.gz wallabag-9c08a891f9bb90bc3f23a575a734283c1ee00ba1.tar.zst wallabag-9c08a891f9bb90bc3f23a575a734283c1ee00ba1.zip |
Merge pull request #1397 from wallabag/v2-graby
Integrate graby
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index a77489e2..b9e4e67e 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -6,7 +6,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | |||
6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
7 | use Symfony\Component\HttpFoundation\Request; | 7 | use Symfony\Component\HttpFoundation\Request; |
8 | use Wallabag\CoreBundle\Entity\Entry; | 8 | use Wallabag\CoreBundle\Entity\Entry; |
9 | use Wallabag\CoreBundle\Service\Extractor; | ||
10 | use Wallabag\CoreBundle\Form\Type\NewEntryType; | 9 | use Wallabag\CoreBundle\Form\Type\NewEntryType; |
11 | use Wallabag\CoreBundle\Form\Type\EditEntryType; | 10 | use Wallabag\CoreBundle\Form\Type\EditEntryType; |
12 | use Wallabag\CoreBundle\Filter\EntryFilterType; | 11 | use Wallabag\CoreBundle\Filter\EntryFilterType; |
@@ -31,10 +30,7 @@ class EntryController extends Controller | |||
31 | $form->handleRequest($request); | 30 | $form->handleRequest($request); |
32 | 31 | ||
33 | if ($form->isValid()) { | 32 | if ($form->isValid()) { |
34 | $content = Extractor::extract($entry->getUrl()); | 33 | $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl()); |
35 | |||
36 | $entry->setTitle($content->getTitle()); | ||
37 | $entry->setContent($content->getBody()); | ||
38 | 34 | ||
39 | $em = $this->getDoctrine()->getManager(); | 35 | $em = $this->getDoctrine()->getManager(); |
40 | $em->persist($entry); | 36 | $em->persist($entry); |