make hr bbtag shareable, stray quote in duepuntozero wall_item

diff --git a/include/conversation.php b/include/conversation.php
index b44d4acd6e94acbed8a105c8939b5b00cd8c3899..4eff0d088b70a77183bf5104ec3cc98aacb29a78 100755 (executable)
--- 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 b8a3abb314a9e482d989a58079ae25ead1f7ab85..e5f716b297e6cb58e494c2d29b9c341e4939041f 100755 (executable)
--- 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]");\r
                        rep(/<blockquote[^>]*>/gi,"[quote]");\r
                        rep(/<\/blockquote>/gi,"[/quote]");\r
+                       rep(/<hr \/>/gi,"[hr]");\r
                        rep(/<br \/>/gi,"\n\n");\r
                        rep(/<br\/>/gi,"\n\n");\r
                        rep(/<br>/gi,"\n");\r
@@ -135,6 +136,7 @@
                        rep(/\[\/i\]/gi,"</em>");\r
                        rep(/\[u\]/gi,"<u>");\r
                        rep(/\[\/u\]/gi,"</u>");\r
+                       rep(/\[hr\]/gi,"<hr />");
                        rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");\r
                        rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");\r
                        rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");\r

diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 5d54a1d6a58663b3ea2b914e308d391e9ff0aa7d..a5136eed3a6421f9bdde983582fb9a24f620856b 100755 (executable)
--- 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 }}