diff options
| author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
| commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
| tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /lib/unblockform.php | |
| parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
| parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'lib/unblockform.php')
| -rw-r--r-- | lib/unblockform.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/unblockform.php b/lib/unblockform.php index b89d7ff78..8daad3c92 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { * * @see BlockForm */ - class UnblockForm extends ProfileActionForm { /** @@ -52,7 +51,6 @@ class UnblockForm extends ProfileActionForm * * @return string Name of the action, lowercased. */ - function target() { return 'unblock'; @@ -63,11 +61,10 @@ class UnblockForm extends ProfileActionForm * * @return string Title of the form, internationalized */ - function title() { // TRANS: Title for the form to unblock a user. - return _('Unblock'); + return _m('TITLE','Unblock'); } /** @@ -75,7 +72,6 @@ class UnblockForm extends ProfileActionForm * * @return string description of the form, internationalized */ - function description() { // TRANS: Description of the form to unblock a user. |