From 7f8f8271e49a2834a87012ea838099c8b46cf63f Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Mar 2015 00:22:11 +0100 Subject: redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring --- inc/poche/Database.class.php | 4 ++-- inc/poche/Poche.class.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'inc/poche') 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 { public function getPreviousArticle($id, $user_id) { - $sql = "SELECT id FROM entries WHERE id = (SELECT max(id) FROM entries WHERE id < ?) AND user_id=? AND is_read=0"; + $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"; $params = array($id, $user_id); $query = $this->executeQuery($sql, $params); $id_entry = $query->fetchAll(); @@ -445,7 +445,7 @@ class Database { public function getNextArticle($id, $user_id) { - $sql = "SELECT id FROM entries WHERE id = (SELECT min(id) FROM entries WHERE id > ?) AND user_id=? AND is_read=0"; + $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"; $params = array($id, $user_id); $query = $this->executeQuery($sql, $params); $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 if ($this->store->retrieveOneById($next_id, $this->user->getId())) { $next = TRUE; } - $navigate = $arrayName = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id); + $navigate = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id); # tags $tags = $this->store->retrieveTagsByEntry($entry['id']); -- cgit v1.2.3