Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into merge-requests/41

This commit is contained in:
Mikael Nordfeldth 2015-02-10 18:41:18 +01:00
commit a45cdae083

View File

@ -73,6 +73,10 @@ class NewnoticeAction extends FormAction
$this->formOpts[$opt] = $this->trimmed($opt); $this->formOpts[$opt] = $this->trimmed($opt);
} }
} }
// Backwards compatibility for "share this" widget things.
// If no 'content', use 'status_textarea'
$this->formOpts['content'] = $this->trimmed('content') ?: $this->trimmed('status_textarea');
} }
/** /**