remove magpie, fix article filter plugins

3 files changed, 8 insertions, 31 deletions

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 027d07539..25569302b 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -57,7 +57,11 @@ class PluginHost {
 	}
 
 	function get_hooks($type) {
-		return $this->hooks[$type];
+		if (isset($this->hooks[$type])) {
+			return $this->hooks[$type];
+		} else {
+			return array();
+		}
 	}
 
 	function load($classlist) {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 1f6d63f2c..373498f3c 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -475,7 +475,6 @@ class Pref_Feeds extends Handler_Protected {
 	function editfeed() {
 		global $purge_intervals;
 		global $update_intervals;
-		global $update_methods;
 
 		$feed_id = db_escape_string($_REQUEST["id"]);
 
@@ -547,20 +546,10 @@ class Pref_Feeds extends Handler_Protected {
 		print_select_hash("update_interval", $update_interval, $update_intervals,
 			'dojoType="dijit.form.Select"');
 
-		/* Update method */
-
-		$update_method = db_fetch_result($result, 0, "update_method",
-			'dojoType="dijit.form.Select"');
-
-		print " " . __('using') . " ";
-		print_select_hash("update_method", $update_method, $update_methods,
-			'dojoType="dijit.form.Select"');
+		/* Purge intl */
 
 		$purge_interval = db_fetch_result($result, 0, "purge_interval");
 
-
-			/* Purge intl */
-
 		print "<hr/>";
 		print __('Article purging:') . " ";
 
@@ -746,7 +735,6 @@ class Pref_Feeds extends Handler_Protected {
 	function editfeeds() {
 		global $purge_intervals;
 		global $update_intervals;
-		global $update_methods;
 
 		$feed_ids = db_escape_string($_REQUEST["ids"]);
 
@@ -805,13 +793,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		$this->batch_edit_cbox("update_interval");
 
-		/* Update method */
-
-		print " " . __('using') . " ";
-		print_select_hash("update_method", $update_method, $update_methods,
-			'disabled="1" dojoType="dijit.form.Select"');
-		$this->batch_edit_cbox("update_method");
-
 		/* Purge intl */
 
 		if (FORCE_ARTICLE_PURGE == 0) {
@@ -929,7 +910,6 @@ class Pref_Feeds extends Handler_Protected {
 			db_escape_string($_POST["cache_images"]));
 		$cache_content = checkbox_to_sql_bool(
 			db_escape_string($_POST["cache_content"]));
-		$update_method = (int) db_escape_string($_POST["update_method"]);
 
 		$always_display_enclosures = checkbox_to_sql_bool(
 			db_escape_string($_POST["always_display_enclosures"]));
@@ -970,8 +950,7 @@ class Pref_Feeds extends Handler_Protected {
 				always_display_enclosures = $always_display_enclosures,
 				mark_unread_on_update = $mark_unread_on_update,
 				update_on_checksum_change = $update_on_checksum_change,
-				update_method = '$update_method'
-				WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
+			WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
 
 		} else {
 			$feed_data = array();
@@ -1045,10 +1024,6 @@ class Pref_Feeds extends Handler_Protected {
 						$qpart = "rtl_content = $rtl_content";
 						break;
 
-					case "update_method":
-						$qpart = "update_method = '$update_method'";
-						break;
-
 					case "cat_id":
 						$qpart = $category_qpart_nocomma;
 						break;
diff --git a/classes/rpc.php b/classes/rpc.php
index 4e08c3dc7..c7cdc3810 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -684,8 +684,6 @@ class RPC extends Handler_Protected {
 
 				db_query($this->link, "BEGIN");
 
-				$update_method = 0;
-
 				if ($cat_id == "0" || !$cat_id) {
 					$cat_qpart = "NULL";
 				} else {
@@ -701,7 +699,7 @@ class RPC extends Handler_Protected {
 						"INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
 						VALUES ('".$_SESSION["uid"]."', '$feed',
-							'[Unknown]', $cat_qpart, '$login', '$pass', '$update_method')");
+							'[Unknown]', $cat_qpart, '$login', '$pass', 0)");
 				}
 
 				db_query($this->link, "COMMIT");