diff options
author | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
commit | 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (patch) | |
tree | 5b4092e365023c7729fcdd8260431d3ffb28b519 /actions/confirmaddress.php | |
parent | 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 (diff) | |
parent | d7d3a50d8751f071aa95541813af1d190e71430e (diff) |
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'actions/confirmaddress.php')
-rw-r--r-- | actions/confirmaddress.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index eaf1c91c1..f92db3ec4 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -89,6 +89,7 @@ class ConfirmaddressAction extends Action $transports = array(); Event::handle('GetImTransports', array(&$transports)); if (!in_array($type, array('email', 'sms')) && !in_array($type, array_keys($transports))) { + // TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim') $this->serverError(sprintf(_('Unrecognized address type %s'), $type)); return; } |