From 991885f1d40b8a8f16cd17c028f5c93eba69a5f3 Mon Sep 17 00:00:00 2001 From: Chris Case Date: Sun, 22 May 2011 19:18:58 -0700 Subject: [PATCH] improved standards compliance of some of the tags and fixed an issue which caused text to bump-over youtube video embeds --- include/bbcode.php | 6 +++--- view/wall_item.tpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 195fc9181..c2d932674 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -90,15 +90,15 @@ function bbcode($Text,$preserve_nl = false) { // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '', $Text); + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '', $Text); // Youtube extensions $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '', $Text); + $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '
', $Text); -// $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '', $Text); +// $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '
', $Text); // oembed tag $Text = oembed_bbcode2html($Text); diff --git a/view/wall_item.tpl b/view/wall_item.tpl index b33ab779e..e5e03744f 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -5,7 +5,7 @@ onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)"> - $name + $name menu