diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
| commit | c43f647049c78b594c90e95d06d12f29f300d5d3 (patch) | |
| tree | a6b02ad763a5d539158721edbe8ca73e158d8ca4 /include/bbcode.php | |
| parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
| parent | e2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff) | |
| download | volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2 volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 978b4af69..4caf18766 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -90,7 +90,7 @@ function bbcode($Text) { $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1">', $Text); // Youtube extensions - $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$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 |