summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/newnotice.php3
-rw-r--r--lib/util.php5
2 files changed, 5 insertions, 3 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index cc62901f2..faf9b21ef 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -48,7 +48,8 @@ class NewnoticeAction extends Action {
assert($notice);
$notice->profile_id = $user->id; # user id *is* profile id
$notice->created = DB_DataObject_Cast::dateTime();
- $notice->content = trim($this->arg('content'));
+ # Default theme uses 'content' for something else
+ $notice->content = trim($this->arg('noticecontent'));
$val = $notice->validate();
if ($val === TRUE) {
diff --git a/lib/util.php b/lib/util.php
index a92204aa6..e4699bf1a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -235,7 +235,8 @@ function common_submit($id, $label) {
function common_textarea($id, $label, $content=NULL) {
common_element_start('p');
common_element('label', array('for' => $id), $label);
- common_element('textarea', array('rows' => 3, 'cols' => 40,
+ common_element('textarea', array('rows' => 3,
+ 'cols' => 40,
'name' => $id,
'id' => $id,
'class' => 'width50'),
@@ -392,7 +393,7 @@ function common_profile_url($nickname) {
function common_notice_form() {
common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
'action' => common_local_url('newnotice')));
- common_textarea('content', _t('What\'s up?'));
+ common_textarea('noticecontent', _t('What\'s up?'));
common_submit('submit', _t('Send'));
common_element_end('form');
}