diff options
| author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
| commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
| tree | bbd512126515afc929de06dce79ba847b9681092 /include/oembed.php | |
| parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
| parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
| download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip | |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x | include/oembed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oembed.php b/include/oembed.php index 118f7fa4a..5c3c595f5 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -11,7 +11,7 @@ function oembed_replacecb($matches){ function oembed_fetch_url($embedurl){ - + $txt = Cache::get($embedurl); $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); |