aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-30 23:09:39 -0700
committerFriendika <info@friendika.com>2011-08-30 23:09:39 -0700
commitf0c3a75ff38dcd208710fa24596c34290faf110e (patch)
treedcfe58104b8ccbb0dd7c83ad8199388f99d2383a
parentb11a0efff120508a2059afe372f50144dcc8b977 (diff)
downloadvolse-hubzilla-f0c3a75ff38dcd208710fa24596c34290faf110e.tar.gz
volse-hubzilla-f0c3a75ff38dcd208710fa24596c34290faf110e.tar.bz2
volse-hubzilla-f0c3a75ff38dcd208710fa24596c34290faf110e.zip
youtube redirect fixes
-rw-r--r--include/bbcode.php6
-rw-r--r--include/conversation.php2
-rw-r--r--mod/item.php2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index a3f2971e5..9ee8b7b36 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -133,12 +133,14 @@ function bbcode($Text,$preserve_nl = false) {
} else {
// Youtube extensions
$Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
+ $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text);
- $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
+ $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
}
-// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
+// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
+
// oembed tag
$Text = oembed_bbcode2html($Text);
diff --git a/include/conversation.php b/include/conversation.php
index 3353cb2b7..6b5bf8d7c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -80,8 +80,6 @@ function localize_item(&$item){
}
- // fix bad embeds
- $item['body'] = str_replace('http://www.youtube.com/embed/http:','http:',$item['body']);
}
diff --git a/mod/item.php b/mod/item.php
index dd42014eb..b6ea8ff08 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -353,7 +353,7 @@ function item_post(&$a) {
* and we are replying, and there isn't one already
*/
- if(($parent_contact) && ($parent_contact['network'] === 'stat')
+ if(($parent_contact) && ($parent_contact['network'] === NETWORK_OSTATUS)
&& ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
$body = '@' . $parent_contact['nick'] . ' ' . $body;
$tags[] = '@' . $parent_contact['nick'];