aboutsummaryrefslogtreecommitdiffstats
path: root/mod/acl.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-11 08:36:24 +0200
committerzottel <github@zottel.net>2012-05-11 08:36:24 +0200
commitc43a03e21bcd12b24be8a59741ec6591c1f651d7 (patch)
treec1c90892400ef5d5916f35e1d65a23b860480875 /mod/acl.php
parent4709960189e48fa1e073035cde916767f3dd830e (diff)
parent8a5dcf64d84b98bda80e0346d508efc072c50002 (diff)
downloadvolse-hubzilla-c43a03e21bcd12b24be8a59741ec6591c1f651d7.tar.gz
volse-hubzilla-c43a03e21bcd12b24be8a59741ec6591c1f651d7.tar.bz2
volse-hubzilla-c43a03e21bcd12b24be8a59741ec6591c1f651d7.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/acl.php')
-rw-r--r--mod/acl.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/acl.php b/mod/acl.php
index 402d37376..168b1f59f 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -127,12 +127,15 @@ function acl_init(&$a){
if($type == 'm') {
$x = array();
$x['query'] = $search;
+ $x['photos'] = array();
+ $x['links'] = array();
$x['suggestions'] = array();
$x['data'] = array();
if(count($r)) {
foreach($r as $g) {
- $x['suggestions'][] = sprintf( t('%s [%s]'),$g['name'],$g['url']);
- // '<img src="' . $g['micro'] . ' height="16" width="16" alt="' . t('Image/photo') . '" />' .
+ $x['photos'][] = $g['micro'];
+ $x['links'][] = $g['url'];
+ $x['suggestions'][] = $g['name']; // sprintf( t('%s [%s]'),$g['name'],$g['url']);
$x['data'][] = intval($g['id']);
}
}