diff options
| author |  Alexis Degrugillier <github@ainw.org>
| 2014-02-04 22:56:46 -0500 |
|---|---|---|
| committer | Alexis Degrugillier <github@ainw.org>
| 2014-02-04 22:56:46 -0500 |
| commit | aa63f9f64fbf01039bf5b766263dbc18a1ebbd4c (patch) | |
| tree | c31e1cf633dfeb0a67f5a51427ae567c7550b955 /app/Models | |
| parent | a201450b5817af23a57e8c68569c24ed5451b7ef (diff) | |
| parent | 575d0002cc3839760f0a389eb4af8cd7d23b74c6 (diff) | |
Merge branch 'dev' into shortcuts
Ajoute le défilement automatique de l'article quand le partage est sélectionné.
Conflicts:
p/scripts/main.js
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 366c04c67..c71fb41ae 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -218,7 +218,7 @@ class FreshRSS_Feed extends Minz_Model { } if (($mtime === true) || ($mtime > $this->lastUpdate)) { - syslog(LOG_DEBUG, 'FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate); + syslog(LOG_DEBUG, 'FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $subscribe_url); $this->loadEntries($feed); // et on charge les articles du flux } else { syslog(LOG_DEBUG, 'FreshRSS use cache for ' . $subscribe_url); |