forked from GNUsocial/gnu-social
		
	Merge commit 'refs/merge-requests/48' of https://gitorious.org/social/mainline into merge-requests/48
This commit is contained in:
		@@ -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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user