Merge remote-tracking branch 'statusnet/master'

[quix0rs-gnu-social.git] / actions / peopletagged.php

diff --git a/actions/peopletagged.php b/actions/peopletagged.php
index 424bf2dcbe3fc59eec5afc3835f10f1c75d42aef..6f9748c234f6c269e15edd60ec95dfc16736d83e 100644 (file)
--- a/actions/peopletagged.php
+++ b/actions/peopletagged.php
@@ -58,7 +58,12 @@ class PeopletaggedAction extends Action
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);