summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-26 14:35:25 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-26 14:35:25 +0000
commit937a05fb5d043ee6c2ce0e2d668c93f8b6717bc9 (patch)
tree4d32a6f2fa4ff1722831cf97b4a833d71ca2506e /classes
parentcbdf8e51aa2826e11cc17c34bcbf568ca37e26ce (diff)
parent2f1e719cbee6734053c70845665204ee1899c88e (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'classes')
-rw-r--r--classes/File_redirection.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index d6fa0bcb6..363e3b947 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -182,7 +182,7 @@ class File_redirection extends Memcached_DataObject
}
}
- if (('ftp' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) {
+ if (('ftp' == $p['scheme']) || ('ftps' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) {
if (empty($p['host'])) return false;
if (empty($p['path'])) {
$out_url .= '/';