diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/activities.php | 6 | ||||
| -rw-r--r-- | include/text.php | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/activities.php b/include/activities.php index d978ebcd6..d770ccb23 100644 --- a/include/activities.php +++ b/include/activities.php @@ -48,7 +48,11 @@ function profile_activity($changed, $value) { if($t == 1 && strlen($value)) { // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to. - $value = linkify($value); + $value = preg_replace_callback("/([^\]\='".'"'."]|^|\#\^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $value); + // take out the bookmark indicator + if(substr($value,0,2) === '#^') + $value = str_replace('#^','',$value); + $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); $message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof); } diff --git a/include/text.php b/include/text.php index 6516d734d..cd34fd88d 100644 --- a/include/text.php +++ b/include/text.php @@ -884,6 +884,7 @@ function linkify($s) { return($s); } + /** * @function sslify($s) * Replace media element using http url with https to a local redirector if using https locally |