Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

5 files changed, 12 insertions, 12 deletions

diff --git a/include/group.php b/include/group.php
index 39a907336..38d9d190f 100644
--- a/include/group.php
+++ b/include/group.php
@@ -18,7 +18,7 @@ function group_add($uid,$name,$public = 0) {
 				intval($r)
 			);
 			if(($z) && $z[0]['deleted']) {
-				/*$r = q("UPDATE groups SET deleted = 0 WHERE uid = %d AND gname = '%s' LIMIT 1",
+				/*$r = q("UPDATE groups SET deleted = 0 WHERE uid = %d AND gname = '%s'",
 					intval($uid),
 					dbesc($name)
 				);*/
diff --git a/include/import.php b/include/import.php
index 49cdb2574..0d8398acb 100644
--- a/include/import.php
+++ b/include/import.php
@@ -227,7 +227,7 @@ function sync_objs($channel,$objs) {
 		foreach($objs as $obj) {
 
 			if(array_key_exists('obj_deleted',$obj) && $obj['obj_deleted'] && $obj['obj_obj']) {
-				q("delete from obj where obj_obj = '%s' and obj_channel = %d limit 1",
+				q("delete from obj where obj_obj = '%s' and obj_channel = %d",
 					dbesc($obj['obj_obj']),
 					intval($channel['channel_id'])
 				);
@@ -351,7 +351,7 @@ function sync_apps($channel,$apps) {
 			}
 			
 			if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
-                q("delete from app where app_id = '%s' and app_channel = %d limit 1",
+                q("delete from app where app_id = '%s' and app_channel = %d",
                     dbesc($app['app_id']),
                     intval($channel['channel_id'])
                 );
@@ -416,7 +416,7 @@ function sync_apps($channel,$apps) {
 				create_table_from_array('app',$app);
 
 				if($term) {
-					$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
+					$x = q("select * from app where app_id = '%s' and app_channel = %d",
 						dbesc($hash),
 						intval($channel['channel_id'])
 					);
@@ -466,7 +466,7 @@ function sync_chatrooms($channel,$chatrooms) {
 				continue;
 
 			if(array_key_exists('cr_deleted',$chatroom) && $chatroom['cr_deleted']) {
-                q("delete from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
+                q("delete from chatroom where cr_name = '%s' and cr_uid = %d",
                     dbesc($chatroom['cr_name']),
                     intval($channel['channel_id'])
                 );
@@ -635,7 +635,7 @@ function sync_events($channel,$events) {
 				continue;
 
 			if($event['event_deleted']) {
-				$r = q("delete from event where event_hash = '%s' and uid = %d limit 1",
+				$r = q("delete from event where event_hash = '%s' and uid = %d",
 					dbesc($event['event_hash']),
 					intval($channel['channel_id'])
 				);	
@@ -889,14 +889,14 @@ function import_mail($channel,$mails,$sync = false) {
 	if($channel && $mails) {
 		foreach($mails as $mail) {
 			if(array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) {
-				q("delete from mail where mid = '%s' and uid = %d limit 1",
+				q("delete from mail where mid = '%s' and uid = %d",
 					dbesc($mail['message_id']),
 					intval($channel['channel_id'])
 				);
 				continue;
 			}
 			if(array_key_exists('flags',$mail) && in_array('recalled',$mail['flags'])) {
-				q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d limit 1",
+				q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d",
 					dbesc($mail['message_id']),
 					intval($channel['channel_id'])
 				);
diff --git a/include/menu.php b/include/menu.php
index 3b0180d37..b54ff7f9e 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -284,7 +284,7 @@ function menu_delete_id($menu_id, $uid) {
 			intval($menu_id),
 			intval($uid)
 		);
-		return q("delete from menu where menu_id = %d and menu_channel_id = %d limit 1",
+		return q("delete from menu where menu_id = %d and menu_channel_id = %d",
 			intval($menu_id),
 			intval($uid)
 		);
diff --git a/include/network.php b/include/network.php
index 24e77527f..7cfd3a5e6 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1434,7 +1434,7 @@ function discover_by_webbie($webbie) {
 			dbesc($address)
 		);
 		if($r) {
-			$r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1",
+			$r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s'",
 				dbesc($fullname),
 				dbesc($network),
 				dbesc(datetime_convert()),
@@ -2328,4 +2328,4 @@ function probe_api_path($host) {
 	}
 
 	return '';
-}
\ No newline at end of file
+}
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 676620e2f..1e3126f77 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -118,7 +118,7 @@ function queue_deliver($outq, $immediate = false) {
 					dbesc($base)
 				);
 			}
-			q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
+			q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
 				dbesc('accepted for delivery'),
 				dbesc(datetime_convert()),
 				dbesc($outq['outq_hash'])