summaryrefslogtreecommitdiff
path: root/classes/File_redirection.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-27 21:15:14 -0400
committerEvan Prodromou <evan@status.net>2009-09-27 21:15:14 -0400
commit3afcdc18f7bfd23ac780b9f27c47582c1b41bb83 (patch)
tree289e54a747c8b67d5455e85d64045aa7dfb1d54b /classes/File_redirection.php
parentee9856c452a7e54994c30cd9138dd6faa2107001 (diff)
parentfc2426d7ce33bba0e1ad4dfc1ed9af7749695b20 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/File_redirection.php')
-rw-r--r--classes/File_redirection.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 76b18f672..79052bf7d 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -79,6 +79,9 @@ class File_redirection extends Memcached_DataObject
}
}
+ if(strpos($short_url,'://') === false){
+ return $short_url;
+ }
$curlh = File_redirection::_commonCurl($short_url, $redirs);
// Don't include body in output
curl_setopt($curlh, CURLOPT_NOBODY, true);