oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-17 17:08:37 +00:00
Code Wiki Activity

CS

Browse source
This commit is contained in:
Jeremy Benoist 2016-09-25 12:03:12 +02:00
parent 401135852c
commit 82fc3290d4
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/TagController.php
View file

@ -122,7 +122,7 @@ class TagController extends Controller
} }
} }
return $this->render('WallabagCoreBundle:Entry:entries.html.twig',[ return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
'form' => null, 'form' => null,
'entries' => $entries, 'entries' => $entries,
'currentPage' => $page, 'currentPage' => $page,

3
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -97,8 +97,7 @@ class ContentProxy
* @param Entry $entry * @param Entry $entry
* @param array|string $tags An array of tag or a string coma separated of tag * @param array|string $tags An array of tag or a string coma separated of tag
* @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
* It is mostly to fix duplicate tag on import * It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101
* @see http://stackoverflow.com/a/7879164/569101
*/ */
public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = []) public function assignTagsToEntry(Entry $entry, $tags, array $entitiesReady = [])
{ {

1
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View file

@ -2,7 +2,6 @@
namespace Wallabag\CoreBundle\Twig; namespace Wallabag\CoreBundle\Twig;
use Doctrine\ORM\Query;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository; use Wallabag\CoreBundle\Repository\TagRepository;