config: remove ALLOW_SELECT_UPDATE_METHOD

diff --git a/config.php-dist b/config.php-dist
index ea236ff5612f9d829989f21a711c1973c5423092..9d4fd1bbd823e2984d6789ff89803685c73159f0 100644 (file)
--- 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 5920348d45e7be7c7569148b59ed7e78fae0cb03..101729cbc162873ecc6b0c958a837e7796e22c19 100644 (file)
--- 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 */