summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rwxr-xr-xapp/Controllers/feedController.php9
-rw-r--r--app/Models/Feed.php2
2 files changed, 7 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index cf9c993d5..918f007fd 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -14,15 +14,15 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
);
}
}
-
- $this->catDAO = new FreshRSS_CategoryDAO ();
- $this->catDAO->checkDefault ();
}
public function addAction () {
@set_time_limit(300);
if (Minz_Request::isPost ()) {
+ $this->catDAO = new FreshRSS_CategoryDAO ();
+ $this->catDAO->checkDefault ();
+
$url = Minz_Request::param ('url_rss');
$cat = Minz_Request::param ('category', false);
if ($cat === false) {
@@ -309,6 +309,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
public function massiveImportAction () {
@set_time_limit(300);
+ $this->catDAO = new FreshRSS_CategoryDAO ();
+ $this->catDAO->checkDefault ();
+
$entryDAO = new FreshRSS_EntryDAO ();
$feedDAO = new FreshRSS_FeedDAO ();
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);