aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-29 20:09:06 -0700
committerfriendica <info@friendica.com>2014-06-29 20:09:06 -0700
commit4c669be2ef22b7a86b6657cb4cf5d7e4983d48ea (patch)
tree00dc61a60ee658b0a19e3abaa6f3b0b726cdf1c1 /include
parentb1e887209d4b98b34283188b632bdd689f3a8e5e (diff)
downloadvolse-hubzilla-4c669be2ef22b7a86b6657cb4cf5d7e4983d48ea.tar.gz
volse-hubzilla-4c669be2ef22b7a86b6657cb4cf5d7e4983d48ea.tar.bz2
volse-hubzilla-4c669be2ef22b7a86b6657cb4cf5d7e4983d48ea.zip
minor changes
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 60463fc00..6f2296542 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -445,15 +445,21 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$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);
} else {
$Text = str_replace('[observer.baseurl]', '', $Text);
$Text = str_replace('[observer.url]','', $Text);
$Text = str_replace('[observer.name]','', $Text);
$Text = str_replace('[observer.address]','', $Text);
+ $Text = str_replace('[observer.webname]','',$Text);
$Text = str_replace('[observer.photo]','', $Text);
}
+
+
+
+
// Perform URL Search
$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]';