diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
commit | 0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be (patch) | |
tree | 2e4f069d66885c5ca5b77154e9dd5a43ec004ff5 /include/text.php | |
parent | 9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f (diff) | |
parent | ea1173f8f632151d02c71fe6004c6a64d014e80a (diff) | |
download | volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.gz volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.bz2 volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.zip |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'include/text.php')
-rw-r--r-- | include/text.php | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/include/text.php b/include/text.php index a3826de49..a2c0a3209 100644 --- a/include/text.php +++ b/include/text.php @@ -1895,32 +1895,15 @@ function cleardiv() { function bb_translate_video($s) { - - $matches = null; - $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER); - if($r) { - foreach($matches as $mtch) { - if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be'))) - $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s); - elseif(stristr($mtch[1],'vimeo')) - $s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s); - } - } - return $s; + $arr = array('string' => $s); + call_hooks('bb_translate_video',$arr); + return $arr['string']; } function html2bb_video($s) { - - $s = preg_replace('#<object[^>]+>(.*?)https?://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)</object>#ism', - '[youtube]$2[/youtube]', $s); - - $s = preg_replace('#<iframe[^>](.*?)https?://www.youtube.com/embed/([A-Za-z0-9\-_=]+)(.*?)</iframe>#ism', - '[youtube]$2[/youtube]', $s); - - $s = preg_replace('#<iframe[^>](.*?)https?://player.vimeo.com/video/([0-9]+)(.*?)</iframe>#ism', - '[vimeo]$2[/vimeo]', $s); - - return $s; + $arr = array('string' => $s); + call_hooks('html2bb_video',$arr); + return $arr['string']; } /** |