aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Feed.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-10 00:14:41 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-10 00:14:41 +0200
commitf3aef1e59b872b2e8378c2852b1a5307706ed897 (patch)
treec0a6fa84ffc12248ee92af6cd75e9c768faea4b7 /app/Models/Feed.php
parenta7bc54bb996a87a66127101be548d181dc8dd935 (diff)
parente0f9621f4075c486e1568c5cb8e4d690b4c8c57c (diff)
Merge branch 'Alkarex/Logging'
https://github.com/FreshRSS/FreshRSS/pull/815
Diffstat (limited to 'app/Models/Feed.php')
-rw-r--r--app/Models/Feed.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index 5d377de9a..85fb173ec 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -240,16 +240,16 @@ class FreshRSS_Feed extends Minz_Model {
$subscribe_url = $feed->subscribe_url(true);
}
- $clean_url = url_remove_credentials($subscribe_url);
+ $clean_url = SimplePie_Misc::url_remove_credentials($subscribe_url);
if ($subscribe_url !== null && $subscribe_url !== $url) {
$this->_url($clean_url);
}
if (($mtime === true) || ($mtime > $this->lastUpdate)) {
- Minz_Log::notice('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
+ //Minz_Log::debug('FreshRSS no cache ' . $mtime . ' > ' . $this->lastUpdate . ' for ' . $clean_url);
$this->loadEntries($feed); // et on charge les articles du flux
} else {
- Minz_Log::notice('FreshRSS use cache for ' . $clean_url);
+ //Minz_Log::debug('FreshRSS use cache for ' . $clean_url);
$this->entries = array();
}