diff options
| -rw-r--r-- | actions/othersettings.php | 3 | ||||
| -rw-r--r-- | lib/util.php | 4 |
2 files changed, 3 insertions, 4 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')); diff --git a/lib/util.php b/lib/util.php index 3b2ee9d87..ee1a149a7 100644 --- a/lib/util.php +++ b/lib/util.php @@ -750,8 +750,8 @@ function common_render_uri_thingy($matches) { function common_shorten_links($text) { $r = htmlspecialchars($text); // \s = not a horizontal whitespace character (since PHP 5.2.4) -// $r = preg_replace('@[^*]https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); - $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); + $r = preg_replace('@[^*]https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); +// $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r); return $r; } |