diff options
| author | friendica <info@friendica.com> | 2013-08-26 17:48:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-26 17:48:05 -0700 |
| commit | 2e72b136c558652ca9a9b755b29cdb99ee27ee7f (patch) | |
| tree | 287c71a74041658af03c42f580191dd0323f0210 /include | |
| parent | 7a8363c328d69b53a0c949bc2d8a047d2536d911 (diff) | |
| download | volse-hubzilla-2e72b136c558652ca9a9b755b29cdb99ee27ee7f.tar.gz volse-hubzilla-2e72b136c558652ca9a9b755b29cdb99ee27ee7f.tar.bz2 volse-hubzilla-2e72b136c558652ca9a9b755b29cdb99ee27ee7f.zip | |
fix profile change activity where the change is a solitary url - and includes a stray right quote
Diffstat (limited to 'include')
| -rw-r--r-- | include/activities.php | 2 | ||||
| -rw-r--r-- | include/bbcode.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/activities.php b/include/activities.php index 10a01792f..7ef26abeb 100644 --- a/include/activities.php +++ b/include/activities.php @@ -45,6 +45,8 @@ function profile_activity($changed, $value) { $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]'; 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); $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/bbcode.php b/include/bbcode.php index 9f9489893..a0a53a310 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -271,7 +271,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]'; if (strpos($Text,'http') !== false) { - $Text = preg_replace("/([^\"\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text); + $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text); } if (strpos($Text,'[/share]') !== false) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); |