From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 30 Jun 2010 09:16:20 +0000 (+0400)
Subject: config: remove ALLOW_SELECT_UPDATE_METHOD
X-Git-Tag: 1.4.3-proper~25
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=34f29d786640b297466be0d150316c098c5d40dc;p=tt-rss.git

config: remove ALLOW_SELECT_UPDATE_METHOD
---

diff --git a/config.php-dist b/config.php-dist
index ea236ff5..9d4fd1bb 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -155,10 +155,6 @@
 	// Directory for lockfiles, must be writable to the user you run
 	// daemon process or cronjobs under.
 
-	define('ALLOW_SELECT_UPDATE_METHOD', true);
-	// Allow users to select the library to update feeds with - e.g.
-	// Magpie or SimplePie
-
 	define('ENABLE_GZIP_OUTPUT', false);
 	// Selectively gzip output to improve wire performance. This requires
 	// PHP Zlib extension on the server.
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 5920348d..101729cb 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -304,12 +304,10 @@
 
 			/* Update method */
 
-			if (ALLOW_SELECT_UPDATE_METHOD) {
-				$update_method = db_fetch_result($result, 0, "update_method");
+			$update_method = db_fetch_result($result, 0, "update_method");
 
-				print " " . __('using') . " ";
-				print_select_hash("update_method", $update_method, $update_methods);			
-			}
+			print " " . __('using') . " ";
+			print_select_hash("update_method", $update_method, $update_methods);			
 
 			$purge_interval = db_fetch_result($result, 0, "purge_interval");
 
@@ -533,12 +531,10 @@
 
 			/* Update method */
 
-			if (ALLOW_SELECT_UPDATE_METHOD) {
-				print " " . __('using') . " ";
-				print_select_hash("update_method", $update_method, $update_methods, 
-					"disabled");			
-				batch_edit_cbox("update_method");
-			}
+			print " " . __('using') . " ";
+			print_select_hash("update_method", $update_method, $update_methods, 
+				"disabled");			
+			batch_edit_cbox("update_method");
 
 			/* Purge intl */