summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend.php1
-rw-r--r--prefs.js5
-rw-r--r--prefs.php6
3 files changed, 3 insertions, 9 deletions
diff --git a/backend.php b/backend.php
index 4343f0097..a87b7f4ff 100644
--- a/backend.php
+++ b/backend.php
@@ -141,7 +141,6 @@
require_once "modules/pref-filters.php";
require_once "modules/pref-labels.php";
require_once "modules/pref-users.php";
- require_once "modules/pref-feed-browser.php";
if (!sanity_check($link)) { return; }
diff --git a/prefs.js b/prefs.js
index 78b1d18d9..8fdaeb940 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1284,14 +1284,15 @@ function backend_sanity_check_callback() {
}
if (!xmlhttp.responseXML) {
- fatalError(3, "[D001, Received reply is not XML]: " + xmlhttp.responseText);
+ fatalError(3, "Sanity Check: Received reply is not XML",
+ xmlhttp.responseText);
return;
}
var reply = xmlhttp.responseXML.firstChild.firstChild;
if (!reply) {
- fatalError(3, "[D002, Invalid RPC reply]: " + xmlhttp.responseText);
+ fatalError(3, "Sanity Check: Invalid RPC reply", xmlhttp.responseText);
return;
}
diff --git a/prefs.php b/prefs.php
index 7ecea90e7..84ec53b62 100644
--- a/prefs.php
+++ b/prefs.php
@@ -123,12 +123,6 @@ window.onload = init;
onclick="selectTab('genConfig')"><?php echo __('Preferences') ?></div>
<div id="feedConfigTab" class="prefsTab"
onclick="selectTab('feedConfig')"><?php echo __('My Feeds') ?></div>
- <?php if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { ?>
- <!-- <div id="feedBrowserTab" class="prefsTab"
- onclick="selectTab('feedBrowser')"><?php echo __('Other Feeds') ?></div>
- <?php } ?> -->
- <!-- <div id="pubItemsTab" class="prefsTab"
- onclick="selectTab('pubItems')"><?php echo __('Published Articles') ?></div> -->
<div id="filterConfigTab" class="prefsTab"
onclick="selectTab('filterConfig')"><?php echo __('Filters') ?></div>
<div id="labelConfigTab" class="prefsTab"