ソースを参照

Revert bug HTTP 301 introduced by Refactor feedController

https://github.com/FreshRSS/FreshRSS/commit/e2da6e6e6b871dc3dbc289cdd40ba401a21d8e91
Alexandre Alapetite 11 年 前
コミット
5adaf17721
1 ファイル変更1 行追加1 行削除
  1. 1 1
      app/Controllers/feedController.php

+ 1 - 1
app/Controllers/feedController.php

@@ -301,6 +301,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 				continue;
 			}
 			}
 
 
+			$url = $feed->url();	//For detection of HTTP 301
 			try {
 			try {
 				// Load entries
 				// Load entries
 				$feed->load(false);
 				$feed->load(false);
@@ -311,7 +312,6 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				continue;
 				continue;
 			}
 			}
 
 
-			$url = $feed->url();
 			$feed_history = $feed->keepHistory();
 			$feed_history = $feed->keepHistory();
 			if ($feed_history == -2) {
 			if ($feed_history == -2) {
 				// TODO: -2 must be a constant!
 				// TODO: -2 must be a constant!