diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
commit | a1183bf09a93459282078038b94ef89c00297604 (patch) | |
tree | 2e14bec170e37c6615fcd5ff2892233ddffce452 /include/api.php | |
parent | 7fc2b13fe605ad461f6b6aeacd6a187c1ef794de (diff) | |
parent | 1789c3242adcf11fe37f0ef0ec6180966853eeda (diff) | |
download | volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.gz volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.bz2 volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.zip |
Merge remote-tracking branch 'upstream/dev' into embedphotos
Diffstat (limited to 'include/api.php')
-rw-r--r-- | include/api.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/api.php b/include/api.php index f0d886d9b..be525f7e9 100644 --- a/include/api.php +++ b/include/api.php @@ -1904,10 +1904,15 @@ require_once('include/api_auth.php'); $ret = array(); + $x = array('items' => $r,'api_user' => api_user(),'user_info' => $user_info); + call_hooks('api_format_items',$x); + $r = $x['items']; + if(! $r) return $ret; foreach($r as $item) { + localize_item($item); $status_user = (($item['author_xchan']==$user_info['guid'])?$user_info: api_item_get_user($a,$item)); |