diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-06-25 19:25:50 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-23 07:26:58 +0200 |
commit | 9bf83f1fb8d588b871a5d12289179de087756d02 (patch) | |
tree | 990854d3dd7944015f54d2dad73a822331d9bf0d | |
parent | 4da01f492b20312461d3f4f612a98e3b52c76fa9 (diff) | |
download | wallabag-9bf83f1fb8d588b871a5d12289179de087756d02.tar.gz wallabag-9bf83f1fb8d588b871a5d12289179de087756d02.tar.zst wallabag-9bf83f1fb8d588b871a5d12289179de087756d02.zip |
CS
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 3 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 8eaff5f6..43225149 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -367,7 +367,7 @@ class WallabagRestController extends FOSRestController | |||
367 | public function deleteTagLabelAction(Request $request) | 367 | public function deleteTagLabelAction(Request $request) |
368 | { | 368 | { |
369 | $this->validateAuthentication(); | 369 | $this->validateAuthentication(); |
370 | $label = $request->query->get('tag',''); | 370 | $label = $request->query->get('tag', ''); |
371 | 371 | ||
372 | $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label); | 372 | $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label); |
373 | $this->getDoctrine() | 373 | $this->getDoctrine() |
@@ -412,7 +412,6 @@ class WallabagRestController extends FOSRestController | |||
412 | return $this->renderJsonResponse($json); | 412 | return $this->renderJsonResponse($json); |
413 | } | 413 | } |
414 | 414 | ||
415 | |||
416 | /** | 415 | /** |
417 | * Retrieve version number. | 416 | * Retrieve version number. |
418 | * | 417 | * |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 63c4c3be..fada40bb 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -223,13 +223,13 @@ class EntryRepository extends EntityRepository | |||
223 | } | 223 | } |
224 | 224 | ||
225 | /** | 225 | /** |
226 | * Remove tags from all user entries | 226 | * Remove tags from all user entries. |
227 | * | 227 | * |
228 | * @param int $userId | 228 | * @param int $userId |
229 | * @param Array<Tag> $tags | 229 | * @param Array<Tag> $tags |
230 | */ | 230 | */ |
231 | 231 | public function removeTags($userId, $tags) | |
232 | public function removeTags($userId, $tags) { | 232 | { |
233 | foreach ($tags as $tag) { | 233 | foreach ($tags as $tag) { |
234 | $this->removeTag($userId, $tag); | 234 | $this->removeTag($userId, $tag); |
235 | } | 235 | } |