eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'refs/merge-requests/48' of https://gitorious.org/social/mainline into merge-requests/48

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-02-15 22:54:48 +01:00
commit 2b181b40f7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/apiaction.php
View File

@ -1516,6 +1516,11 @@ class ApiAction extends Action
$aargs['id'] = $id; $aargs['id'] = $id;
} }
$user = $this->arg('user');
if (!empty($user)) {
$aargs['user'] = $user;
}
$tag = $this->arg('tag'); $tag = $this->arg('tag');
if (!empty($tag)) { if (!empty($tag)) {
$aargs['tag'] = $tag; $aargs['tag'] = $tag;