summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-06-30 13:16:20 +0400
committerAndrew Dolgov <[email protected]>2010-06-30 13:16:20 +0400
commit34f29d786640b297466be0d150316c098c5d40dc (patch)
treed361efb1ae0b5d8840a27812c47f0689b14d1d1d
parent51d2d404b82593a8311e99bfc901e9f7cd12f6da (diff)
config: remove ALLOW_SELECT_UPDATE_METHOD
-rw-r--r--config.php-dist4
-rw-r--r--modules/pref-feeds.php18
2 files changed, 7 insertions, 15 deletions
diff --git a/config.php-dist b/config.php-dist
index ea236ff56..9d4fd1bbd 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 5920348d4..101729cbc 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 */