aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/feedutils.php7
-rwxr-xr-xinclude/items.php2
2 files changed, 8 insertions, 1 deletions
diff --git a/include/feedutils.php b/include/feedutils.php
index 07350a340..c4e9790de 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -436,6 +436,13 @@ function get_atom_elements($feed, $item) {
$summary = unxmlify($item->get_description(true));
+ if(($summary) && ((strpos($summary,'<') !== false) || (strpos($summary,'>') !== false))) {
+ $summary = purify_html($summary);
+ $summary = html2bbcode($summary);
+ }
+
+
+
// removing the content of the title if its identically to the body
// This helps with auto generated titles e.g. from tumblr
diff --git a/include/items.php b/include/items.php
index 8091252d6..6a6308da1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3653,7 +3653,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
$linked_item = (($item['resource_id']) ? true : false);
- logger('item: ' . $item . ' stage: ' . $stage . ' force: ' . $force, LOGGER_DATA);
+ logger('item: ' . $item['id'] . ' stage: ' . $stage . ' force: ' . $force, LOGGER_DATA);
switch($stage) {
case DROPITEM_PHASE2: