Change branch to 1.2.x since we're utf8mb4 now

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index e6385e495ec75a4d12319a810761c98acb684ace..e241b5812c6af7b0ab73ea459b2d610921f0c655 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/form.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Form for posting a notice
@@ -107,7 +103,7 @@ class NoticeForm extends Form
         // Do we have to worry about sub-second race conditions?
         // XXX: Needs to be above the parent::__construct() call...?
 
-        $this->id_suffix = time();
+        $this->id_suffix = rand();
 
         parent::__construct($action);
 
@@ -209,6 +205,7 @@ class NoticeForm extends Form
             // XXX: vary by defined max size
             $this->out->element('textarea', array('class' => 'notice_data-text',
                                                   'required' => 'required',
+                                                  'placeholder' => _('Share your status...'),
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),