diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-25 12:03:12 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-25 12:03:49 +0200 |
commit | 82fc3290d4fec45ede270e2c1ad2079fe3020adc (patch) | |
tree | 33323388ee3340db8e8921c09061ac84a3da0ecc /src/Wallabag | |
parent | 401135852c6b25c8d5ab97beaefb02d1bd023ec9 (diff) | |
download | wallabag-82fc3290d4fec45ede270e2c1ad2079fe3020adc.tar.gz wallabag-82fc3290d4fec45ede270e2c1ad2079fe3020adc.tar.zst wallabag-82fc3290d4fec45ede270e2c1ad2079fe3020adc.zip |
CS
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/TagController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/ContentProxy.php | 7 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Twig/WallabagExtension.php | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 07cd3edb..623a6146 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -122,7 +122,7 @@ class TagController extends Controller | |||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | return $this->render('WallabagCoreBundle:Entry:entries.html.twig',[ | 125 | return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [ |
126 | 'form' => null, | 126 | 'form' => null, |
127 | 'entries' => $entries, | 127 | 'entries' => $entries, |
128 | 'currentPage' => $page, | 128 | 'currentPage' => $page, |
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index a65a21e8..8019df42 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php | |||
@@ -95,10 +95,9 @@ class ContentProxy | |||
95 | * Assign some tags to an entry. | 95 | * Assign some tags to an entry. |
96 | * | 96 | * |
97 | * @param Entry $entry | 97 | * @param Entry $entry |
98 | * @param array|string $tags An array of tag or a string coma separated of tag | 98 | * @param array|string $tags An array of tag or a string coma separated of tag |
99 | * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed | 99 | * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed |
100 | * It is mostly to fix duplicate tag on import | 100 | * It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101 |
101 | * @see http://stackoverflow.com/a/7879164/569101 | ||
102 | */ | 101 | */ |
103 | public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = []) | 102 | public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = []) |
104 | { | 103 | { |
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php index 0a6896c9..45dc591d 100644 --- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php +++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Twig; | 3 | namespace Wallabag\CoreBundle\Twig; |
4 | 4 | ||
5 | use Doctrine\ORM\Query; | ||
6 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; | 5 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
7 | use Wallabag\CoreBundle\Repository\EntryRepository; | 6 | use Wallabag\CoreBundle\Repository\EntryRepository; |
8 | use Wallabag\CoreBundle\Repository\TagRepository; | 7 | use Wallabag\CoreBundle\Repository\TagRepository; |