diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-17 16:37:37 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-17 16:37:37 +0200 |
| commit | 2116943964e0c10984976f6d38eba044e35f983a (patch) | |
| tree | c351abcd1ccd033c36b472f73d087a8343ee638d /include/bbcode.php | |
| parent | 906addf865ccab2c98d5035fc6c1b10d43004dfe (diff) | |
| parent | 1df892ebbce59ac6293eacbe065ebc71826b4d85 (diff) | |
| download | volse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.tar.gz volse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.tar.bz2 volse-hubzilla-2116943964e0c10984976f6d38eba044e35f983a.zip | |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 9abc7c439..b33be686e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -141,6 +141,9 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text); } + $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); + $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); + $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="425" height="350" src="http://player.vimeo.com/video/$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); |