aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Database.class.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-20 12:49:49 +0100
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2014-02-20 12:49:49 +0100
commitab5bb94b12e04b357f8faee376704bc29ff019a5 (patch)
treee055f9cf96738f7b8a26caed4893951022527eed /inc/poche/Database.class.php
parentd09a5674e915e79762931a3465461327fb5737ea (diff)
parente83cf5a7875d1387d79d1909050ff2eca9b4421a (diff)
downloadwallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.gz
wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.tar.zst
wallabag-ab5bb94b12e04b357f8faee376704bc29ff019a5.zip
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
Diffstat (limited to 'inc/poche/Database.class.php')
-rw-r--r--inc/poche/Database.class.php4
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=?";