summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-25 18:01:46 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-25 18:01:46 -0400
commitd0baab6978f1959382d568d26cc9f8f552a7b764 (patch)
tree32bbe1148e86bb7846ae1f0e581c0f3c0f68956f /classes
parent077955cb1d45f866d65aebdc42f5e3e71dc74045 (diff)
parenta2117961be463d566c8f3c6ccd9b8e840f171804 (diff)
Merge branch '0.8.x' into testing
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 .= '/';