diff options
| author | friendica <info@friendica.com> | 2012-06-13 19:59:20 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-13 19:59:20 -0700 |
| commit | 7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2 (patch) | |
| tree | 852daf8fb843b2f69aa798c69b9bf89d81f17978 /include/text.php | |
| parent | 24bf4632af7b060c9d0cbc39ff9cbc5baee741c3 (diff) | |
| download | volse-hubzilla-7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2.tar.gz volse-hubzilla-7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2.tar.bz2 volse-hubzilla-7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2.zip | |
fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index 8948bf8c4..cc4bee268 100644 --- a/include/text.php +++ b/include/text.php @@ -1255,13 +1255,13 @@ function bb_translate_video($s) { function html2bb_video($s) { - $s = preg_replace('#<object[^>]+>(.*?)https+://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+)(.*?)</object>#ism', + $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', + $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', + $s = preg_replace('#<iframe[^>](.*?)https?://player.vimeo.com/video/([0-9]+)(.*?)</iframe>#ism', '[vimeo]$2[/vimeo]', $s); return $s; |