diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
| commit | f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab (patch) | |
| tree | e6ea5fb4786e843b970b14d5a96da8c32548a315 /src/Wallabag/CoreBundle/Controller/EntryController.php | |
| parent | 73b774438395d0ed74d0fd863194d2ebfb68d9ce (diff) | |
| parent | 6e22bd737b2e543c85487864a9a25b0f2d5cc3f2 (diff) | |
| download | wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.gz wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.zst wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.zip | |
Merge pull request #1110 from wallabag/v2-api-hypermedia
[WIP] API : hypermedia & tags
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 81ab7788..8a8f3cd7 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
| @@ -192,8 +192,9 @@ class EntryController extends Controller | |||
| 192 | { | 192 | { |
| 193 | $this->checkUserAction($entry); | 193 | $this->checkUserAction($entry); |
| 194 | 194 | ||
| 195 | $entry->setDeleted(1); | 195 | $em = $this->getDoctrine()->getManager(); |
| 196 | $this->getDoctrine()->getManager()->flush(); | 196 | $em->remove($entry); |
| 197 | $em->flush(); | ||
| 197 | 198 | ||
| 198 | $this->get('session')->getFlashBag()->add( | 199 | $this->get('session')->getFlashBag()->add( |
| 199 | 'notice', | 200 | 'notice', |