Avoid having to check for notices without rendered copies in upgrade.php

[quix0rs-gnu-social.git] / lib / toselector.php

diff --git a/lib/toselector.php b/lib/toselector.php
index ba9593f0b33bfb2b62a64bbbcbba0e959b5f5e47..153d9001b54aef0882e291168083db9882d01638 100644 (file)
--- a/lib/toselector.php
+++ b/lib/toselector.php
@@ -87,14 +87,13 @@ class ToSelector extends Widget
             $choices['public:everyone'] = _m('SENDTO','Everyone');
             $default = 'public:everyone';
         }
-        // XXX: better name...?
         // TRANS: Option in drop-down of potential addressees.
         // TRANS: %s is a StatusNet sitename.
-        $choices['public:site'] = sprintf(_('My colleagues at %s'), common_config('site', 'name'));
+        $choices['public:site'] = sprintf(_('Everyone at %s'), common_config('site', 'name'));
 
         $groups = $this->user->getGroups();
 
-        while ($groups->fetch()) {
+        while ($groups instanceof User_group && $groups->fetch()) {
             $value = 'group:'.$groups->id;
             if (($this->to instanceof User_group) && $this->to->id == $groups->id) {
                 $default = $value;
@@ -102,7 +101,16 @@ class ToSelector extends Widget
             $choices[$value] = $groups->getBestName();
         }
 
-        // XXX: add users...?
+        // Add subscribed users to dropdown menu
+        $users = $this->user->getSubscribed();
+        while ($users->fetch()) {
+            $value = 'profile:'.$users->id;
+            if ($this->user->streamNicknames()) {
+                $choices[$value] = $users->getNickname();
+            } else {
+                $choices[$value] = $users->getBestName();
+            }
+        }
 
         if ($this->to instanceof Profile) {
             $value = 'profile:'.$this->to->id;
@@ -145,7 +153,7 @@ class ToSelector extends Widget
             }
             break;
         case 'profile':
-            $profile = Profile::staticGet('id', $value);
+            $profile = Profile::getKV('id', $value);
             $options['replies'] = array($profile->getUri());
             if ($private) {
                 $options['scope'] = Notice::ADDRESSEE_SCOPE;