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

2015-02-15 22:54:48 +01:00 · 2015-02-15 22:54:48 +01:00 · 2b181b40f7
parent 4c457c82ef fb03fc073a
commit 2b181b40f7
1 changed files with 5 additions and 0 deletions
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@ -1516,6 +1516,11 @@ class ApiAction extends Action
            $aargs['id'] = $id;
        }

+        $user = $this->arg('user');
+        if (!empty($user)) {
+            $aargs['user'] = $user;
+        }
+
        $tag = $this->arg('tag');
        if (!empty($tag)) {
            $aargs['tag'] = $tag;