the xchan_query wasn't fully optimised as we were comparing quoted and unquoted strings when looking for duplicates

This commit is contained in:
redmatrix 2016-06-22 19:22:59 -07:00
parent 1267d995ef
commit cef77ce5bb

View File

@ -2089,9 +2089,9 @@ function xchan_query(&$items,$abook = true,$effective_uid = 0) {
} }
foreach($items as $item) { foreach($items as $item) {
if($item['owner_xchan'] && (! in_array($item['owner_xchan'],$arr))) if($item['owner_xchan'] && (! in_array("'" . dbesc($item['owner_xchan']) . "'",$arr)))
$arr[] = "'" . dbesc($item['owner_xchan']) . "'"; $arr[] = "'" . dbesc($item['owner_xchan']) . "'";
if($item['author_xchan'] && (! in_array($item['author_xchan'],$arr))) if($item['author_xchan'] && (! in_array("'" . dbesc($item['author_xchan']) . "'",$arr)))
$arr[] = "'" . dbesc($item['author_xchan']) . "'"; $arr[] = "'" . dbesc($item['author_xchan']) . "'";
} }
} }
@ -2124,9 +2124,9 @@ function xchan_mail_query(&$item) {
$arr = array(); $arr = array();
$chans = null; $chans = null;
if($item) { if($item) {
if($item['from_xchan'] && (! in_array($item['from_xchan'],$arr))) if($item['from_xchan'] && (! in_array("'" . dbesc($item['from_xchan']) . "'",$arr)))
$arr[] = "'" . dbesc($item['from_xchan']) . "'"; $arr[] = "'" . dbesc($item['from_xchan']) . "'";
if($item['to_xchan'] && (! in_array($item['to_xchan'],$arr))) if($item['to_xchan'] && (! in_array("'" . dbesc($item['to_xchan']) . "'",$arr)))
$arr[] = "'" . dbesc($item['to_xchan']) . "'"; $arr[] = "'" . dbesc($item['to_xchan']) . "'";
} }