summaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-15 15:38:54 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-05-15 15:38:54 +0200
commit5adaf177210bcd7af0df30d8bebea9b3de67b443 (patch)
tree037cf6610a074f0f4ef46db3e4c3008980c3306d /app/Controllers/feedController.php
parentf4b0661f3db9f0bafb97636808ddc2274010d440 (diff)
Revert bug HTTP 301 introduced by Refactor feedController
https://github.com/FreshRSS/FreshRSS/commit/e2da6e6e6b871dc3dbc289cdd40ba401a21d8e91
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 0443b4159..8db273aca 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -301,6 +301,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue;
}
+ $url = $feed->url(); //For detection of HTTP 301
try {
// Load entries
$feed->load(false);
@@ -311,7 +312,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
continue;
}
- $url = $feed->url();
$feed_history = $feed->keepHistory();
if ($feed_history == -2) {
// TODO: -2 must be a constant!