diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-11 05:34:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-11 05:34:11 -0700 |
| commit | bde8c6d39e1ccf7a53569cc652a62b5447d3243f (patch) | |
| tree | 598928300196120d90a28aac79e57d213dd61779 /include/bbcode.php | |
| parent | 7a106cf60cfa005ec6d8c35f922dc57b9af0175e (diff) | |
| parent | 3d0d36b2bc6d134e1140b9fc8c40206be5bd7d2d (diff) | |
| download | volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.gz volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.tar.bz2 volse-hubzilla-bde8c6d39e1ccf7a53569cc652a62b5447d3243f.zip | |
Merge remote branch 'upstream/master'
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); |