summaryrefslogtreecommitdiff
path: root/tests/URLDetectionTest.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-10-23 23:05:59 +0000
committerZach Copley <zach@status.net>2009-10-23 23:05:59 +0000
commit34a21e76054ad3bfa11a5f790ce983645f651a54 (patch)
tree58b341c3b5ace018aabecfd39ebcfe932147c9e0 /tests/URLDetectionTest.php
parent62ba25f53aaff0cbeb248b10bb2ed45dfbd2b671 (diff)
parentff4f9d8c7d6d1d5c4a69d75924e4da67a883db44 (diff)
Merge branch '0.9.x' into facebook-app-plugin
Diffstat (limited to 'tests/URLDetectionTest.php')
-rw-r--r--tests/URLDetectionTest.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 45203bf6e..0cc03ccce 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -47,7 +47,9 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('127.0.0.1/\'test',
'<a href="http://127.0.0.1/\'test" title="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
array('127.0.0.1/"test',
- '<a href="http://127.0.0.1/&quot;test" title="http://127.0.0.1/&quot;test" rel="external">127.0.0.1/&quot;test</a>'),
+ '<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">127.0.0.1/</a>&quot;test'),
+ array('127.0.0.1/test"test',
+ '<a href="http://127.0.0.1/test" title="http://127.0.0.1/test" rel="external">127.0.0.1/test</a>&quot;test'),
array('127.0.0.1/-test',
'<a href="http://127.0.0.1/-test" title="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
array('127.0.0.1/_test',
@@ -170,6 +172,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
'\'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>\''),
array('"http://example.com"',
'&quot;<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>&quot;'),
+ array('"http://example.com/"',
+ '&quot;<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com/</a>&quot;'),
array('http://example.com',
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
array('(http://example.com)',