From 7a079cd7dcb7b88d745ad9605bdc26c44a6adbc9 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 30 Jun 2014 16:23:42 +0100 Subject: Make [observer.baseurl] more reliable using connurl which will change less often than xchan_url, which can break the regex and might not even contain the baseurl at all, plus a bit of doco clean up. --- include/bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/bbcode.php b/include/bbcode.php index 6f2296542..bab50240c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -439,8 +439,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // replace [observer.baseurl] if ($observer) { - $obsBaseURL = $observer['xchan_url']; - $obsBaseURL = preg_replace("/\/channel\/.*$/", '', $obsBaseURL); + $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); -- cgit v1.2.3