diff options
| author | andi <andi@splitbrain.org> | 2005-05-20 17:07:02 +0200 |
|---|---|---|
| committer | andi <andi@splitbrain.org> | 2005-05-20 17:07:02 +0200 |
| commit | a6755281caf089bc0d12d715100b727bc97aa8da (patch) | |
| tree | 2717b44de51e5b0da75b75c3bcb7765600dc7de2 /inc/parser/handler.php | |
| parent | ee20e7d16637625e900f518b6b46a61bfa30fe6e (diff) | |
| download | rpg-a6755281caf089bc0d12d715100b727bc97aa8da.tar.gz rpg-a6755281caf089bc0d12d715100b727bc97aa8da.tar.bz2 | |
small fixes for linkparsing #337 #339
darcs-hash:20050520150702-9977f-a2ef5264ff38a5225521c83eeaf85759c92a37bb.gz
Diffstat (limited to 'inc/parser/handler.php')
| -rw-r--r-- | inc/parser/handler.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 2379d60ff..d2d201282 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -402,13 +402,6 @@ class Doku_Handler { array($link[0],$link[1]), $pos ); - }elseif ( preg_match('#([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i',$link[0]) ) { - // E-Mail - $this->_addCall( - 'emaillink', - array($link[0],$link[1]), - $pos - ); }elseif ( preg_match('#^([a-z0-9]+?)://#i',$link[0]) ) { // external link (accepts all protocols) $this->_addCall( @@ -416,6 +409,13 @@ class Doku_Handler { array($link[0],$link[1]), $pos ); + }elseif ( preg_match('#([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i',$link[0]) ) { + // E-Mail + $this->_addCall( + 'emaillink', + array($link[0],$link[1]), + $pos + ); }elseif ( preg_match('!^#.+!',$link[0]) ){ // local link $this->_addCall( |