diff options
author | Jeroen <jeroenpraat@xs4all.nl> | 2014-10-10 13:37:09 +0000 |
---|---|---|
committer | Jeroen <jeroenpraat@xs4all.nl> | 2014-10-10 13:37:09 +0000 |
commit | 053e6061089ba89a53caf264ea4a055cec8be8ba (patch) | |
tree | 0323006e1fdf262026fd6198c51c69f05ce6d54b /include/bbcode.php | |
parent | 1dda77596926fe08990c8a6f31412a38fbc602b5 (diff) | |
parent | f2335448f44e270222dad9147bd2b2c4bfec950b (diff) | |
download | volse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.tar.gz volse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.tar.bz2 volse-hubzilla-053e6061089ba89a53caf264ea4a055cec8be8ba.zip |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/bbcode.php')
-rw-r--r-- | include/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index d7a5ac457..6b7217f91 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -162,7 +162,7 @@ function bb_parse_app($match) { function bb_parse_element($match) { $j = json_decode(base64url_decode($match[1]),true); if($j) { - $o = EOL . '<a href="' . z_root() . '" foo="baz" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install design element: ') . $j['pagetitle'] . '</a>' . EOL; + $o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . t('Install design element: ') . $j['pagetitle'] . '</a>' . EOL; } return $o; } @@ -823,7 +823,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); - $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text); + $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm#](.*?)\>/ism",'<$1$2="">',$Text); call_hooks('bbcode',$Text); |