diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 13:03:59 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2014-02-20 13:03:59 +0100 |
| commit | 8975653d4c1e31981b3af190aa5b59754190c757 (patch) | |
| tree | 9c2c77ade29fb692799e7c2508ae6d0fa3fa7257 /inc/poche/Database.class.php | |
| parent | 689de3dbcc1252e230ab25723c237723f5a4d4a1 (diff) | |
| parent | ab5bb94b12e04b357f8faee376704bc29ff019a5 (diff) | |
| download | wallabag-8975653d4c1e31981b3af190aa5b59754190c757.tar.gz wallabag-8975653d4c1e31981b3af190aa5b59754190c757.tar.zst wallabag-8975653d4c1e31981b3af190aa5b59754190c757.zip | |
Merge branch 'mariroz-dev' into dev
Diffstat (limited to 'inc/poche/Database.class.php')
| -rw-r--r-- | inc/poche/Database.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 3332b5a3..a366e866 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
| @@ -345,7 +345,7 @@ class Database { | |||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | public function retrieveAllTags($user_id) { | 347 | public function retrieveAllTags($user_id) { |
| 348 | $sql = "SELECT tags.* FROM tags | 348 | $sql = "SELECT DISTINCT tags.* FROM tags |
| 349 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id | 349 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id |
| 350 | LEFT JOIN entries ON tags_entries.entry_id=entries.id | 350 | LEFT JOIN entries ON tags_entries.entry_id=entries.id |
| 351 | WHERE entries.user_id=?"; | 351 | WHERE entries.user_id=?"; |
| @@ -357,7 +357,7 @@ class Database { | |||
| 357 | 357 | ||
| 358 | public function retrieveTag($id, $user_id) { | 358 | public function retrieveTag($id, $user_id) { |
| 359 | $tag = NULL; | 359 | $tag = NULL; |
| 360 | $sql = "SELECT tags.* FROM tags | 360 | $sql = "SELECT DISTINCT tags.* FROM tags |
| 361 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id | 361 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id |
| 362 | LEFT JOIN entries ON tags_entries.entry_id=entries.id | 362 | LEFT JOIN entries ON tags_entries.entry_id=entries.id |
| 363 | WHERE tags.id=? AND entries.user_id=?"; | 363 | WHERE tags.id=? AND entries.user_id=?"; |