Merge commit 'mainline/0.8.x' into 0.8.x

9ec39110 · Brenda Wallace · 3ff67b3b · 9fd3a415 · 9ec39110 · 9ec39110
Commit 9ec39110 authored Aug 25, 2009 by Brenda Wallace
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 76 additions and 76 deletions

File_redirection.php classes/File_redirection.php +1 -1

URLDetectionTest.php tests/URLDetectionTest.php +75 -75

No files found.
--- 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 .= '/';

--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php