Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/identity.php
	include/widgets.php
	util/messages.po
	view/it/messages.po
	view/it/strings.php

3 files changed, 6 insertions, 6 deletions

diff --git a/include/identity.php b/include/identity.php
index 5ca626c72..b0d62fba7 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -630,7 +630,6 @@ function identity_export_year($channel_id,$year) {
 }
 
 
-
 /**
  * @brief Loads a profile into the App structure.
  *
diff --git a/include/items.php b/include/items.php
index b1a0dacdf..d24dbed9f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2685,11 +2685,12 @@ function item_store_update($arr,$allow_exec = false) {
 		return $ret;
 	}
 
+	$r = q("delete from term where oid = %d and otype = %d",
+		intval($orig_post_id),
+		intval(TERM_OBJ_POST)
+	);
+
 	if(is_array($terms)) {
-		$r = q("delete from term where oid = %d and otype = %d",
-			intval($orig_post_id),
-			intval(TERM_OBJ_POST)
-		);
 		foreach($terms as $t) {
 			q("insert into term (uid,oid,otype,type,term,url)
 				values(%d,%d,%d,%d,'%s','%s') ",
@@ -2701,7 +2702,6 @@ function item_store_update($arr,$allow_exec = false) {
 				dbesc($t['url'])
 			);
 		}
-
 		$arr['term'] = $terms;
 	}
 
diff --git a/include/widgets.php b/include/widgets.php
index 6c1df3022..36671e719 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -380,6 +380,7 @@ function widget_categories($arr) {
 	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
 
 	return categories_widget($srchurl, $cat);
+
 }
 
 function widget_tagcloud_wall($arr) {