summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 11:28:09 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-02-15 11:28:09 +0100
commit4485a8917160fb9f955e5b8aa28c1a5499c608b0 (patch)
tree227f848209efa8d9fb93c846379e89e5c5d35324
parent5a9ce44695f44ecc76f356c1fc26f0a1846231b7 (diff)
downloadrpg-4485a8917160fb9f955e5b8aa28c1a5499c608b0.tar.gz
rpg-4485a8917160fb9f955e5b8aa28c1a5499c608b0.tar.bz2
Fix double slash in coral interwikilink
-rw-r--r--_test/tests/inc/parser/renderer_resolveinterwiki.test.php3
-rw-r--r--conf/interwiki.conf2
2 files changed, 2 insertions, 3 deletions
diff --git a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
index f17838f92..ea4f99511 100644
--- a/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
+++ b/_test/tests/inc/parser/renderer_resolveinterwiki.test.php
@@ -20,8 +20,7 @@ class Test_resolveInterwiki extends PHPUnit_Framework_TestCase {
array('wp', 'foo @+%/#txt', 'http://en.wikipedia.org/wiki/foo @+%/#txt'),
array('amazon', 'foo @+%/#txt', 'http://www.amazon.com/exec/obidos/ASIN/foo%20%40%2B%25%2F/splitbrain-20/#txt'),
array('doku', 'foo @+%/#txt', 'http://www.dokuwiki.org/foo%20%40%2B%25%2F#txt'),
- //ToDo: Check needed, is double slash in path desired
- array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%2F', 'http://example.com.83.nyud.net:8090//path/naar/?query=foo%20%40%2B%25%2F'),
+ array('coral', 'http://example.com:83/path/naar/?query=foo%20%40%2B%25%2F', 'http://example.com.83.nyud.net:8090/path/naar/?query=foo%20%40%2B%25%2F'),
array('scheme', 'ftp://foo @+%/#txt', 'ftp://example.com#txt'),
//relative url
array('withslash', 'foo @+%/#txt', '/testfoo%20%40%2B%25%2F#txt'),
diff --git a/conf/interwiki.conf b/conf/interwiki.conf
index 2d83043ef..999462170 100644
--- a/conf/interwiki.conf
+++ b/conf/interwiki.conf
@@ -24,7 +24,7 @@ amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
phpfn http://www.php.net/{NAME}
-coral http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
+coral http://{HOST}.{PORT}.nyud.net:8090{PATH}?{QUERY}
freecache http://freecache.org/{NAME}
sb http://www.splitbrain.org/go/
skype skype:{NAME}