Merge remote-tracking branch 'upstream/dev' into wiki

2016-06-09 20:07:09 -04:00
parent 9410b63bbc ee5372784e
commit 7a242f829f
5 changed files with 21 additions and 21 deletions
--- 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));