diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-03-16 21:40:36 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-03-16 21:40:36 +0100 |
| commit | 3500d4099f88f7db22eba42fdb7e8926f1f1cdac (patch) | |
| tree | a738ada4e0aaa8f915c8f1aa5f7f916617b70990 /src/Wallabag/ApiBundle/Controller | |
| parent | 17051137ec7cb4273dd2da6bca58e245d648e34a (diff) | |
| parent | 3107f92acb638bb5bf8067daaa5500ae65b5b116 (diff) | |
| download | wallabag-3500d4099f88f7db22eba42fdb7e8926f1f1cdac.tar.gz wallabag-3500d4099f88f7db22eba42fdb7e8926f1f1cdac.tar.zst wallabag-3500d4099f88f7db22eba42fdb7e8926f1f1cdac.zip | |
Merge pull request #1797 from wallabag/v2-fix-adding-entry-API
Don't add entry through API if it already exists
Diffstat (limited to 'src/Wallabag/ApiBundle/Controller')
| -rw-r--r-- | src/Wallabag/ApiBundle/Controller/WallabagRestController.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 29cab1f4..2633a311 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
| @@ -112,10 +112,14 @@ class WallabagRestController extends FOSRestController | |||
| 112 | $isArchived = $request->request->get('archive'); | 112 | $isArchived = $request->request->get('archive'); |
| 113 | $isStarred = $request->request->get('starred'); | 113 | $isStarred = $request->request->get('starred'); |
| 114 | 114 | ||
| 115 | $entry = $this->get('wallabag_core.content_proxy')->updateEntry( | 115 | $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId()); |
| 116 | new Entry($this->getUser()), | 116 | |
| 117 | $url | 117 | if (false === $entry) { |
| 118 | ); | 118 | $entry = $this->get('wallabag_core.content_proxy')->updateEntry( |
| 119 | new Entry($this->getUser()), | ||
| 120 | $url | ||
| 121 | ); | ||
| 122 | } | ||
| 119 | 123 | ||
| 120 | $tags = $request->request->get('tags', ''); | 124 | $tags = $request->request->get('tags', ''); |
| 121 | if (!empty($tags)) { | 125 | if (!empty($tags)) { |