1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00

redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring

This commit is contained in:
Thomas Citharel 2015-03-14 00:22:11 +01:00
parent f5618feb73
commit 7f8f8271e4
164 changed files with 13271 additions and 6804 deletions

View file

@ -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();

View file

@ -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']);