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/api.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/api.php')
| -rw-r--r-- | include/api.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/api.php b/include/api.php index 74b4aaf6e..1334d8eae 100644 --- a/include/api.php +++ b/include/api.php @@ -483,11 +483,7 @@ $txt = requestdata('htmlstatus'); if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) { - $txt = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s', - '[youtube]$1[/youtube]', $txt); - - $txt = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s', - '[youtube]$1[/youtube]', $txt); + $txt = html2bb_video($txt); $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); |