GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

trac31 let * preceding a url prevent its shortening. 

darcs-hash:20081113170234-099f7-b714b0640370b8ecf37aa422455831dae5ce4c5e.gz
This commit is contained in:
millette 2008-11-13 12:02:34 -05:00
parent efabf7d341
commit f2506b0339
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/othersettings.php
View File

@ -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'));

4
lib/util.php
View File

@ -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;
}