diff options
author | friendica <info@friendica.com> | 2012-02-16 23:14:36 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-02-16 23:14:36 -0800 |
commit | 48f5bd492de7acb021b9065beb2586391efb3c9e (patch) | |
tree | 4d1bdb10135539fd7c306aa77e11983bc348b875 | |
parent | 2abbd81ce1760cdfd4098ae1d5cda29e608eb021 (diff) | |
download | volse-hubzilla-48f5bd492de7acb021b9065beb2586391efb3c9e.tar.gz volse-hubzilla-48f5bd492de7acb021b9065beb2586391efb3c9e.tar.bz2 volse-hubzilla-48f5bd492de7acb021b9065beb2586391efb3c9e.zip |
naked link with no protocol being passed from Diaspora
-rwxr-xr-x | doc/developer | 18 | ||||
-rwxr-xr-x | include/oembed.php | 5 |
2 files changed, 5 insertions, 18 deletions
diff --git a/doc/developer b/doc/developer deleted file mode 100755 index dd8b316ea..000000000 --- a/doc/developer +++ /dev/null @@ -1,18 +0,0 @@ -Friendica Developer Guide - -Here is how you can join us. - -First, get yourself a working git package on the system where you will be -doing development. - -Create your own github account. - -Follow the instructions provided here: [[http://help.github.com/fork-a-repo/]] -to create and use your own tracking fork on github - -Then go to your github page and create a "Pull request" when you are ready -to notify us to merge your work. - -**Important** - -Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
\ No newline at end of file diff --git a/include/oembed.php b/include/oembed.php index 118f7fa4a..af3413a25 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -12,6 +12,11 @@ function oembed_replacecb($matches){ function oembed_fetch_url($embedurl){ + if(! strpos('://',$embedurl)) { + // this may be wrong but it's already wrong, we can only guess + $embedurl = 'http://' . $embedurl; + } + $txt = Cache::get($embedurl); $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); |