From 9fb2a87c9a55be8c0b8bffc7aa438dae5acc7390 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Aug 2013 00:04:38 -0700
Subject: Another try at issue #61 and #62 - an earlier fix was partially
 working but the issue persisted - this extends it a bit.

---
 include/items.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'include/items.php')

diff --git a/include/items.php b/include/items.php
index df49ba5c7..5137a8b31 100755
--- a/include/items.php
+++ b/include/items.php
@@ -773,14 +773,19 @@ function decode_tags($t) {
 
 function activity_sanitise($arr) {
 	if($arr) {
-		$ret = array();
-		foreach($arr as $k => $x) {
-			if(is_array($x))
-				$ret[$k] = activity_sanitise($x);
-			else
-				$ret[$k] = htmlentities($x, ENT_COMPAT,'UTF-8',false);
+		if(is_array($arr)) {
+			$ret = array();
+			foreach($arr as $k => $x) {
+				if(is_array($x))
+					$ret[$k] = activity_sanitise($x);
+				else
+					$ret[$k] = htmlentities($x, ENT_COMPAT,'UTF-8',false);
+			}
+			return $ret;
+		}
+		else {
+			return htmlentities($arr, ENT_COMPAT,'UTF-8', false);
 		}
-		return $ret;
 	}
 	return '';
 }
@@ -1572,10 +1577,10 @@ function item_store($arr,$allow_exec = false) {
 		unset($arr['term']);
 	}
 
-	dbesc_array($arr);
-
 	logger('item_store: ' . print_r($arr,true), LOGGER_DATA);
 
+	dbesc_array($arr);
+
 	$r = dbq("INSERT INTO `item` (`" 
 			. implode("`, `", array_keys($arr)) 
 			. "`) VALUES ('" 
-- 
cgit v1.2.3