aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Database.class.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-15 11:49:24 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-15 11:49:24 +0200
commit0f6273cdb8c77436593782d42f271fddc7a7875d (patch)
treecd6e0959768f5fac7eac054572a97b3a30674af2 /inc/poche/Database.class.php
parenta9f5e572dde4f986a498d2fbe92a38a1b22f9595 (diff)
parent26452f891f3ba75f2636733dbfe943535636df06 (diff)
downloadwallabag-0f6273cdb8c77436593782d42f271fddc7a7875d.tar.gz
wallabag-0f6273cdb8c77436593782d42f271fddc7a7875d.tar.zst
wallabag-0f6273cdb8c77436593782d42f271fddc7a7875d.zip
Merge pull request #761 from wallabag/dev1.7.1
1.7.1
Diffstat (limited to 'inc/poche/Database.class.php')
-rwxr-xr-xinc/poche/Database.class.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 9e901974..11cccb72 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -409,6 +409,7 @@ class Database {
409 public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) { 409 public function add($url, $title, $content, $user_id, $isFavorite=0, $isRead=0) {
410 $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)'; 410 $sql_action = 'INSERT INTO entries ( url, title, content, user_id, is_fav, is_read ) VALUES (?, ?, ?, ?, ?, ?)';
411 $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead); 411 $params_action = array($url, $title, $content, $user_id, $isFavorite, $isRead);
412
412 if ( !$this->executeQuery($sql_action, $params_action) ) { 413 if ( !$this->executeQuery($sql_action, $params_action) ) {
413 $id = null; 414 $id = null;
414 } 415 }
@@ -487,7 +488,7 @@ class Database {
487 $sql = 488 $sql =
488 "SELECT entries.* FROM entries 489 "SELECT entries.* FROM entries
489 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id 490 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
490 WHERE tags_entries.tag_id = ? AND entries.user_id=?"; 491 WHERE tags_entries.tag_id = ? AND entries.user_id=? ORDER by entries.id DESC";
491 $query = $this->executeQuery($sql, array($tag_id, $user_id)); 492 $query = $this->executeQuery($sql, array($tag_id, $user_id));
492 $entries = $query->fetchAll(); 493 $entries = $query->fetchAll();
493 494