summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authormillette <millette@controlyourself.ca>2008-11-13 12:02:34 -0500
committermillette <millette@controlyourself.ca>2008-11-13 12:02:34 -0500
commitf2506b0339d073294ce5e1a17c3ce9a661a983e9 (patch)
treec4f436e27c361d76c7da1bfca77e8e2c56ffd561 /actions
parentefabf7d34107fc494ef1009672ef9983f98821ee (diff)
trac31 let * preceding a url prevent its shortening.
darcs-hash:20081113170234-099f7-b714b0640370b8ecf37aa422455831dae5ce4c5e.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/othersettings.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 9f1ad9949..497500509 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -39,7 +39,6 @@ class OthersettingsAction extends SettingsAction {
common_hidden('token', common_session_token());
common_element('h2', NULL, _('URL Auto-shortening'));
-
$services = array(
'' => 'None',
'ur1.ca' => 'ur1.ca (free service)',
@@ -52,7 +51,7 @@ class OthersettingsAction extends SettingsAction {
'metamark.net' => 'metamark.net'
);
- common_dropdown('urlshorteningservice', _('Service'), $services, _('Shortening service to use when notices exceed the 140 character limit.'), FALSE, $user->urlshorteningservice);
+ common_dropdown('urlshorteningservice', _('Service'), $services, _('Shortening service to use when notices exceed the 140 character limit. Precede a URL with a * to prevent shortening of that URL.'), FALSE, $user->urlshorteningservice);
common_submit('save', _('Save'));