summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/functions.php5
-rw-r--r--include/rssfuncs.php7
2 files changed, 9 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php
index c16172856..ee061eca7 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -10,6 +10,7 @@
$fetch_last_error = false;
$fetch_last_error_code = false;
$fetch_last_content_type = false;
+ $fetch_last_error_content = false; // curl only for the time being
$fetch_curl_used = false;
$suppress_debugging = false;
@@ -349,6 +350,7 @@
global $fetch_last_error;
global $fetch_last_error_code;
+ global $fetch_last_error_content;
global $fetch_last_content_type;
global $fetch_curl_used;
@@ -431,6 +433,7 @@
} else {
$fetch_last_error = "HTTP Code: $http_code";
}
+ $fetch_last_error_content = $contents;
curl_close($ch);
return false;
}
@@ -1973,8 +1976,6 @@
function getFeedTitle($id, $cat = false) {
if ($cat) {
return getCategoryTitle($id);
- } else if ($id == 0) {
- return __("All feeds");
} else if ($id == -1) {
return __("Starred articles");
} else if ($id == -2) {
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index cdc490cb0..f657f8413 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -687,6 +687,12 @@
foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
$article = $plugin->hook_article_filter($article);
+
+ $article["stored"] = array("title" => $article["title"],
+ "content" => $article["content"],
+ "link" => $article["link"],
+ "tags" => $article["tags"],
+ "author" => $article["author"]);
}
$entry_tags = $article["tags"];
@@ -697,7 +703,6 @@
$entry_plugin_data = db_escape_string($article["plugin_data"]);
$entry_content = $article["content"]; // escaped below
-
_debug("plugin data: $entry_plugin_data", $debug_enabled);
if ($cache_images && is_writable(CACHE_DIR . '/images'))