diff options
author | Habeas Codice <habeascodice@federated.social> | 2014-11-26 11:02:30 -0800 |
---|---|---|
committer | Habeas Codice <habeascodice@federated.social> | 2014-11-26 11:02:30 -0800 |
commit | d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5 (patch) | |
tree | 0dd876ff9767998ec13c73cab2ff02f5cbce371a /include/bbcode.php | |
parent | 1a57f3ed517e7dd68bd6c7a23802ebee138c128f (diff) | |
parent | 3bb0ef8a82ec660ff8ef37b9abc93da94234649a (diff) | |
download | volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.gz volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.tar.bz2 volse-hubzilla-d3ffdbf2a4e25636cb2762f35c69fcc1abbcf7d5.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
-rw-r--r-- | include/bbcode.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 6b7217f91..5b7451a6b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -431,14 +431,16 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // replace [observer.baseurl] if ($observer) { + $s1 = '<span class="bb_observer">'; + $s2 = '</span>'; $obsBaseURL = $observer['xchan_connurl']; $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); $Text = str_replace('[observer.baseurl]', $obsBaseURL, $Text); $Text = str_replace('[observer.url]',$observer['xchan_url'], $Text); - $Text = str_replace('[observer.name]',$observer['xchan_name'], $Text); - $Text = str_replace('[observer.address]',$observer['xchan_addr'], $Text); - $Text = str_replace('[observer.webname]',substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')), $Text); - $Text = str_replace('[observer.photo]','[zmg]'.$observer['xchan_photo_l'].'[/zmg]', $Text); + $Text = str_replace('[observer.name]',$s1 . $observer['xchan_name'] . $s2, $Text); + $Text = str_replace('[observer.address]',$s1 . $observer['xchan_addr'] . $s2, $Text); + $Text = str_replace('[observer.webname]',$s1 . substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')) . $s2, $Text); + $Text = str_replace('[observer.photo]',$s1 . '[zmg]'.$observer['xchan_photo_l'].'[/zmg]' . $s2, $Text); } else { $Text = str_replace('[observer.baseurl]', '', $Text); $Text = str_replace('[observer.url]','', $Text); |