X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticeform.php;h=e6385e495ec75a4d12319a810761c98acb684ace;hb=c137ead909eddd4a6c08333c42079cba271091bf;hp=01a462aad1bbbfc03ea85ed43a36b5756d358e93;hpb=5147404ea2cd5b41d5cad8f3c3769cbde0a2e2a9;p=quix0rs-gnu-social.git

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 01a462aad1..e6385e495e 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -83,7 +83,7 @@ class NoticeForm extends Form
     var $to_group;
 
     /** select this user from the drop-down by default. */
-    var $to_user;
+    var $to_profile;
 
     /** Pre-click the private checkbox. */
     var $private;
@@ -131,7 +131,7 @@ class NoticeForm extends Form
 
         if (empty($this->to_profile) &&
             !empty($this->inreplyto)) {
-            $notice = Notice::staticGet('id', $this->inreplyto);
+            $notice = Notice::getKV('id', $this->inreplyto);
             if (!empty($notice)) {
                 $this->to_profile = $notice->getProfile();
             }
@@ -208,6 +208,7 @@ class NoticeForm extends Form
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('class' => 'notice_data-text',
+                                                  'required' => 'required',
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),
@@ -238,15 +239,15 @@ class NoticeForm extends Form
             }
             $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
 
-            $this->out->elementStart('div');
+            $this->out->elementStart('div', 'to-selector');
             $toWidget = new ToSelector($this->out,
                                        $this->user,
-                                       (!empty($this->to_group) ? $this->to_group : $this->to_user));
+                                       (!empty($this->to_group) ? $this->to_group : $this->to_profile));
 
             $toWidget->show();
             $this->out->elementEnd('div');
 
-            if ($this->user->shareLocation()) {
+            if ($this->profile->shareLocation()) {
                 $this->out->hidden('notice_data-lat', empty($this->lat) ? (empty($this->profile->lat) ? null : $this->profile->lat) : $this->lat, 'lat');
                 $this->out->hidden('notice_data-lon', empty($this->lon) ? (empty($this->profile->lon) ? null : $this->profile->lon) : $this->lon, 'lon');
                 $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
@@ -256,6 +257,7 @@ class NoticeForm extends Form
                                                       'data-api' => common_local_url('geocode')));
 
                 // @fixme checkbox method allows no way to change the id without changing the name
+                //// TRANS: Checkbox label to allow sharing geo location in notices.
                 //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementStart('label', 'notice_data-geo');
                 $this->out->element('input', array(