diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index d6fa0bcb62..363e3b947c 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 .= '/';
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index f35b03eaf2..e69f1a2c38 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -28,155 +28,155 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('example',
'example'),
array('http://example',
- 'http://example'),
+ 'http://example'),
array('http://example/',
- 'http://example/'),
+ 'http://example/'),
array('http://example/path',
- 'http://example/path'),
+ 'http://example/path'),
array('http://example.com',
- 'http://example.com'),
+ 'http://example.com'),
array('https://example.com',
- 'https://example.com'),
+ 'https://example.com'),
array('ftp://example.com',
- 'ftp://example.com'),
+ 'ftp://example.com'),
array('ftps://example.com',
- 'ftps://example.com'),
+ 'ftps://example.com'),
array('http://user@example.com',
- 'http://user@example.com'),
+ 'http://user@example.com'),
array('http://user:pass@example.com',
- 'http://user:pass@example.com'),
+ 'http://user:pass@example.com'),
array('http://example.com:8080',
- 'http://example.com:8080'),
+ 'http://example.com:8080'),
array('http://www.example.com',
- 'http://www.example.com'),
+ 'http://www.example.com'),
array('http://example.com/',
- 'http://example.com/'),
+ 'http://example.com/'),
array('http://example.com/path',
- 'http://example.com/path'),
+ 'http://example.com/path'),
array('http://example.com/path.html',
- 'http://example.com/path.html'),
+ 'http://example.com/path.html'),
array('http://example.com/path.html#fragment',
- 'http://example.com/path.html#fragment'),
+ 'http://example.com/path.html#fragment'),
array('http://example.com/path.php?foo=bar&bar=foo',
- 'http://example.com/path.php?foo=bar&bar=foo'),
+ 'http://example.com/path.php?foo=bar&bar=foo'),
array('http://müllärör.de',
- 'http://müllärör.de'),
+ 'http://müllärör.de'),
array('http://ﺱﺲﺷ.com',
- 'http://ﺱﺲﺷ.com'),
+ 'http://ﺱﺲﺷ.com'),
array('http://сделаткартинки.com',
- 'http://сделаткартинки.com'),
+ 'http://сделаткартинки.com'),
array('http://tūdaliņ.lv',
- 'http://tūdaliņ.lv'),
+ 'http://tūdaliņ.lv'),
array('http://brændendekærlighed.com',
- 'http://brændendekærlighed.com'),
+ 'http://brændendekærlighed.com'),
array('http://あーるいん.com',
- 'http://あーるいん.com'),
+ 'http://あーるいん.com'),
array('http://예비교사.com',
- 'http://예비교사.com'),
+ 'http://예비교사.com'),
array('http://example.com.',
- 'http://example.com.'),
+ 'http://example.com.'),
array('http://example.com?',
- 'http://example.com?'),
+ 'http://example.com?'),
array('http://example.com!',
- 'http://example.com!'),
+ 'http://example.com!'),
array('http://example.com,',
- 'http://example.com,'),
+ 'http://example.com,'),
array('http://example.com;',
- 'http://example.com;'),
+ 'http://example.com;'),
array('http://example.com:',
- 'http://example.com:'),
+ 'http://example.com:'),
array('\'http://example.com\'',
- '\'http://example.com\''),
+ '\'http://example.com\''),
array('"http://example.com"',
- '"http://example.com"'),
+ '"http://example.com"'),
array('http://example.com
',
- 'http://example.com'),
+ 'http://example.com'),
array('(http://example.com)',
- '(http://example.com)'),
+ '(http://example.com)'),
array('[http://example.com]',
- '[http://example.com]'),
+ '[http://example.com]'),
array('',
- '<http://example.com>'),
+ '<http://example.com>'),
array('http://example.com/path/(foo)/bar',
- 'http://example.com/path/(foo)/bar'),
+ 'http://example.com/path/(foo)/bar'),
array('http://example.com/path/[foo]/bar',
- 'http://example.com/path/[foo]/bar'),
+ 'http://example.com/path/[foo]/bar'),
array('http://example.com/path/foo/(bar)',
- 'http://example.com/path/foo/(bar)'),
+ 'http://example.com/path/foo/(bar)'),
array('http://example.com/path/foo/[bar]',
- 'http://example.com/path/foo/[bar]'),
+ 'http://example.com/path/foo/[bar]'),
array('Hey, check out my cool site http://example.com okay?',
- 'Hey, check out my cool site http://example.com okay?'),
+ 'Hey, check out my cool site http://example.com okay?'),
array('What about parens (e.g. http://example.com/path/foo/(bar))?',
- 'What about parens (e.g. http://example.com/path/foo/(bar))?'),
+ 'What about parens (e.g. http://example.com/path/foo/(bar))?'),
array('What about parens (e.g. http://example.com/path/foo/(bar)?',
- 'What about parens (e.g. http://example.com/path/foo/(bar)?'),
+ 'What about parens (e.g. http://example.com/path/foo/(bar)?'),
array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
- 'What about parens (e.g. http://example.com/path/foo/(bar).)?'),
+ 'What about parens (e.g. http://example.com/path/foo/(bar).)?'),
array('What about parens (e.g. http://example.com/path/(foo,bar)?',
- 'What about parens (e.g. http://example.com/path/(foo,bar)?'),
+ 'What about parens (e.g. http://example.com/path/(foo,bar)?'),
array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
- 'Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?'),
+ 'Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?'),
array('Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?',
- 'Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?'),
+ 'Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?'),
array('Unbalanced too (e.g. http://example.com/path/foo/((((bar)?',
- 'Unbalanced too (e.g. http://example.com/path/foo/((((bar)?'),
+ 'Unbalanced too (e.g. http://example.com/path/foo/((((bar)?'),
array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
- 'Unbalanced too (e.g. http://example.com/path/foo/(bar))))?'),
+ 'Unbalanced too (e.g. http://example.com/path/foo/(bar))))?'),
array('example.com',
- 'example.com'),
+ 'example.com'),
array('example.org',
- 'example.org'),
+ 'example.org'),
array('example.co.uk',
- 'example.co.uk'),
+ 'example.co.uk'),
array('www.example.co.uk',
- 'www.example.co.uk'),
+ 'www.example.co.uk'),
array('farm1.images.example.co.uk',
- 'farm1.images.example.co.uk'),
+ 'farm1.images.example.co.uk'),
array('example.museum',
- 'example.museum'),
+ 'example.museum'),
array('example.travel',
- 'example.travel'),
+ 'example.travel'),
array('example.com.',
- 'example.com.'),
+ 'example.com.'),
array('example.com?',
- 'example.com?'),
+ 'example.com?'),
array('example.com!',
- 'example.com!'),
+ 'example.com!'),
array('example.com,',
- 'example.com,'),
+ 'example.com,'),
array('example.com;',
- 'example.com;'),
+ 'example.com;'),
array('example.com:',
- 'example.com:'),
+ 'example.com:'),
array('\'example.com\'',
- '\'example.com\''),
+ '\'example.com\''),
array('"example.com"',
- '"example.com"'),
+ '"example.com"'),
array('example.com
',
- 'example.com'),
+ 'example.com'),
array('(example.com)',
- '(example.com)'),
+ '(example.com)'),
array('[example.com]',
- '[example.com]'),
+ '[example.com]'),
array('',
- '<example.com>'),
+ '<example.com>'),
array('Hey, check out my cool site example.com okay?',
- 'Hey, check out my cool site example.com okay?'),
+ 'Hey, check out my cool site example.com okay?'),
array('Hey, check out my cool site example.com.I made it.',
- 'Hey, check out my cool site example.com.I made it.'),
+ 'Hey, check out my cool site example.com.I made it.'),
array('Hey, check out my cool site example.com.Funny thing...',
- 'Hey, check out my cool site example.com.Funny thing...'),
+ 'Hey, check out my cool site example.com.Funny thing...'),
array('Hey, check out my cool site example.com.You will love it.',
- 'Hey, check out my cool site example.com.You will love it.'),
+ 'Hey, check out my cool site example.com.You will love it.'),
array('What about parens (e.g. example.com/path/foo/(bar))?',
- 'What about parens (e.g. example.com/path/foo/(bar))?'),
+ 'What about parens (e.g. example.com/path/foo/(bar))?'),
array('What about parens (e.g. example.com/path/foo/(bar)?',
- 'What about parens (e.g. example.com/path/foo/(bar)?'),
+ 'What about parens (e.g. example.com/path/foo/(bar)?'),
array('What about parens (e.g. example.com/path/foo/(bar).)?',
- 'What about parens (e.g. example.com/path/foo/(bar).)?'),
+ 'What about parens (e.g. example.com/path/foo/(bar).)?'),
array('What about parens (e.g. example.com/path/(foo,bar)?',
- 'What about parens (e.g. example.com/path/(foo,bar)?'),
+ 'What about parens (e.g. example.com/path/(foo,bar)?'),
array('file.ext',
'file.ext'),
array('file.html',