diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-14 23:54:54 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-14 23:54:54 +0100 |
| commit | 7c2f8eec8f8dbd26e20f8afc516e38d5c6f1cc02 (patch) | |
| tree | 5bb26a98541c7e3444b67a7d923556e10eb874f2 | |
| parent | 62c8004ec7c360471b96b4faa6128cd207f89bf2 (diff) | |
| download | rpg-7c2f8eec8f8dbd26e20f8afc516e38d5c6f1cc02.tar.gz rpg-7c2f8eec8f8dbd26e20f8afc516e38d5c6f1cc02.tar.bz2 | |
handle interwiki without slashes as pageids. Added user interwiki
* allowed urlparams
* added `wiki:users:` as default user profile link
| -rw-r--r-- | conf/interwiki.conf | 1 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/interwiki.conf b/conf/interwiki.conf index 28561a4ae..68367d0bd 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -30,6 +30,7 @@ sb http://www.splitbrain.org/go/ skype skype:{NAME} google.de http://www.google.de/search?q= go http://www.google.com/search?q={URL}&btnI=lucky +user wiki:users:{URL} # To support VoIP/SIP links callto callto://{NAME} diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 80701cd2e..fbdd8ada6 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -699,6 +699,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer { //get interwiki URL $url = $this->_resolveInterWiki($wikiName,$wikiUri); + if(strpos($url,'/') === false) { + list($url, $urlparam) = explode('?', $url, 2); + $url = wl($url, $urlparam); + } + if ( !$isImage ) { $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName); $link['class'] = "interwiki iw_$class"; |