diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-03-14 00:22:11 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-03-14 00:22:11 +0100 |
commit | 7f8f8271e49a2834a87012ea838099c8b46cf63f (patch) | |
tree | 2c5394e49370d8e6890019de3889ab193b827aa8 /inc/poche | |
parent | f5618feb73343f0a120a809116c443630d70a87c (diff) | |
download | wallabag-7f8f8271e49a2834a87012ea838099c8b46cf63f.tar.gz wallabag-7f8f8271e49a2834a87012ea838099c8b46cf63f.tar.zst wallabag-7f8f8271e49a2834a87012ea838099c8b46cf63f.zip |
redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring
Diffstat (limited to 'inc/poche')
-rwxr-xr-x | inc/poche/Database.class.php | 4 | ||||
-rwxr-xr-x | inc/poche/Poche.class.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 823f834c..1a88d7d9 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -435,7 +435,7 @@ class Database { | |||
435 | 435 | ||
436 | public function getPreviousArticle($id, $user_id) | 436 | public function getPreviousArticle($id, $user_id) |
437 | { | 437 | { |
438 | $sql = "SELECT id FROM entries WHERE id = (SELECT max(id) FROM entries WHERE id < ?) AND user_id=? AND is_read=0"; | 438 | $sql = "SELECT id FROM entries WHERE id = (SELECT max(id) FROM entries WHERE id < ? AND is_read=0) AND user_id=? AND is_read=0"; |
439 | $params = array($id, $user_id); | 439 | $params = array($id, $user_id); |
440 | $query = $this->executeQuery($sql, $params); | 440 | $query = $this->executeQuery($sql, $params); |
441 | $id_entry = $query->fetchAll(); | 441 | $id_entry = $query->fetchAll(); |
@@ -445,7 +445,7 @@ class Database { | |||
445 | 445 | ||
446 | public function getNextArticle($id, $user_id) | 446 | public function getNextArticle($id, $user_id) |
447 | { | 447 | { |
448 | $sql = "SELECT id FROM entries WHERE id = (SELECT min(id) FROM entries WHERE id > ?) AND user_id=? AND is_read=0"; | 448 | $sql = "SELECT id FROM entries WHERE id = (SELECT min(id) FROM entries WHERE id > ? AND is_read=0) AND user_id=? AND is_read=0"; |
449 | $params = array($id, $user_id); | 449 | $params = array($id, $user_id); |
450 | $query = $this->executeQuery($sql, $params); | 450 | $query = $this->executeQuery($sql, $params); |
451 | $id_entry = $query->fetchAll(); | 451 | $id_entry = $query->fetchAll(); |
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index b27dda6c..465d9f95 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -556,7 +556,7 @@ class Poche | |||
556 | if ($this->store->retrieveOneById($next_id, $this->user->getId())) { | 556 | if ($this->store->retrieveOneById($next_id, $this->user->getId())) { |
557 | $next = TRUE; | 557 | $next = TRUE; |
558 | } | 558 | } |
559 | $navigate = $arrayName = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id); | 559 | $navigate = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id); |
560 | 560 | ||
561 | # tags | 561 | # tags |
562 | $tags = $this->store->retrieveTagsByEntry($entry['id']); | 562 | $tags = $this->store->retrieveTagsByEntry($entry['id']); |