Merge https://github.com/friendica/red into pending_merge

2015-01-06 11:26:53 -08:00
parent 01e65ffbb4 1064be3a76
commit b8d3936e47
5 changed files with 411 additions and 5 deletions
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -437,7 +437,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {

 	// replace [observer.baseurl]
 	if ($observer) {
-		$s1 = '<span class="bb_observer">';
+		$s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
 		$s2 = '</span>';
 		$obsBaseURL = $observer['xchan_connurl'];
 		$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);