xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrige bug marquage favoris pour f.priority = 0

Browse Source 
https://github.com/marienfressinaud/FreshRSS/issues/270
pull/326/head
Alexandre Alapetite 11 years ago
parent de923b57f4
commit e177b288f5
1 changed files with 11 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      app/models/Entry.php

18
app/models/Entry.php
Unescape View File

@ -257,13 +257,15 @@ class EntryDAO extends Model_pdo {
return false; return false;
} }
} }
public function markReadEntries ($idMax = 0, $onlyFavorites = false) { public function markReadEntries ($idMax = 0, $favorites = false) {
if ($idMax === 0) { if ($idMax === 0) {
$sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed = f.id ' $sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed = f.id '
. 'SET e.is_read = 1, f.cache_nbUnreads=0 ' . 'SET e.is_read = 1, f.cache_nbUnreads=0 '
. 'WHERE e.is_read = 0 AND f.priority > 0'; . 'WHERE e.is_read = 0 AND ';
if ($onlyFavorites) { if ($favorites) {
$sql .= ' AND e.is_favorite = 1'; $sql .= 'e.is_favorite = 1';
} else {
$sql .= 'f.priority > 0';
} }
$stm = $this->bd->prepare ($sql); $stm = $this->bd->prepare ($sql);
if ($stm && $stm->execute ()) { if ($stm && $stm->execute ()) {
@ -278,9 +280,11 @@ class EntryDAO extends Model_pdo {
$sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed = f.id ' $sql = 'UPDATE `' . $this->prefix . 'entry` e INNER JOIN `' . $this->prefix . 'feed` f ON e.id_feed = f.id '
. 'SET e.is_read = 1 ' . 'SET e.is_read = 1 '
. 'WHERE e.is_read = 0 AND e.id <= ? AND f.priority > 0'; . 'WHERE e.is_read = 0 AND e.id <= ? AND ';
if ($onlyFavorites) { if ($favorites) {
$sql .= ' AND e.is_favorite = 1'; $sql .= 'e.is_favorite = 1';
} else {
$sql .= 'f.priority > 0';
} }
$values = array ($idMax); $values = array ($idMax);
$stm = $this->bd->prepare ($sql); $stm = $this->bd->prepare ($sql);

Write Preview
Loading…
Cancel
Save