From: friendica <info@friendica.com>
Date: Tue, 14 Feb 2012 02:23:03 +0000 (-0800)
Subject: make hr bbtag shareable, stray quote in duepuntozero wall_item
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=803a7425eaff955bd0001b46ee7f22c5d80acb89;p=friendica.git

make hr bbtag shareable, stray quote in duepuntozero wall_item
---

diff --git a/include/conversation.php b/include/conversation.php
index b44d4acd6e..4eff0d088b 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -609,7 +609,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					if ($tag!="") $tags[] = bbcode($tag);
 				}
 
-
 				// Build the HTML
 
 				$body = prepare_body($item,true);
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index b8a3abb314..e5f716b297 100755
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -105,6 +105,7 @@
 			rep(/<u>/gi,"[u]");
 			rep(/<blockquote[^>]*>/gi,"[quote]");
 			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/<hr \/>/gi,"[hr]");
 			rep(/<br \/>/gi,"\n\n");
 			rep(/<br\/>/gi,"\n\n");
 			rep(/<br>/gi,"\n");
@@ -135,6 +136,7 @@
 			rep(/\[\/i\]/gi,"</em>");
 			rep(/\[u\]/gi,"<u>");
 			rep(/\[\/u\]/gi,"</u>");
+			rep(/\[hr\]/gi,"<hr />");
 			rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");
 			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
 			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 5d54a1d6a5..a5136eed3a 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -42,7 +42,7 @@
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
 				<a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
 				<a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+				{{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
 				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 			</div>
 			{{ endif }}