diff options
author | Dominik Eckelmann <deckelmann@gmail.com> | 2012-05-14 21:56:38 +0200 |
---|---|---|
committer | Dominik Eckelmann <deckelmann@gmail.com> | 2012-05-14 21:57:43 +0200 |
commit | 16f15a8172591c8e5725677b192ec836030b424a (patch) | |
tree | 31e6f153feb669c515b963760b8d719bc89461ab /inc/common.php | |
parent | 8414853140930bdf4f14cfee2f8a532d47c07129 (diff) | |
download | rpg-16f15a8172591c8e5725677b192ec836030b424a.tar.gz rpg-16f15a8172591c8e5725677b192ec836030b424a.tar.bz2 |
empty ID in wl() will be treated as $conf['start']
Diffstat (limited to 'inc/common.php')
-rw-r--r-- | inc/common.php | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/inc/common.php b/inc/common.php index 6ea536c44..cd0780730 100644 --- a/inc/common.php +++ b/inc/common.php @@ -342,16 +342,18 @@ function idfilter($id,$ue=true){ * * @author Andreas Gohr <andi@splitbrain.org> */ -function wl($id='',$more='',$abs=false,$sep='&'){ +function wl($id='',$urlParameters='',$absolute=false,$separator='&'){ global $conf; - if(is_array($more)){ - $more = buildURLparams($more,$sep); + if(is_array($urlParameters)){ + $urlParameters = buildURLparams($urlParameters,$separator); }else{ - $more = str_replace(',',$sep,$more); + $urlParameters = str_replace(',',$separator,$urlParameters); } - - $id = idfilter($id); - if($abs){ + if ($id === '') { + $id = $conf['start']; + } + $id = idfilter($id); + if($absolute){ $xlink = DOKU_URL; }else{ $xlink = DOKU_BASE; @@ -359,16 +361,16 @@ function wl($id='',$more='',$abs=false,$sep='&'){ if($conf['userewrite'] == 2){ $xlink .= DOKU_SCRIPT.'/'.$id; - if($more) $xlink .= '?'.$more; + if($urlParameters) $xlink .= '?'.$urlParameters; }elseif($conf['userewrite']){ $xlink .= $id; - if($more) $xlink .= '?'.$more; + if($urlParameters) $xlink .= '?'.$urlParameters; }elseif($id){ $xlink .= DOKU_SCRIPT.'?id='.$id; - if($more) $xlink .= $sep.$more; + if($urlParameters) $xlink .= $separator.$urlParameters; }else{ $xlink .= DOKU_SCRIPT; - if($more) $xlink .= '?'.$more; + if($urlParameters) $xlink .= '?'.$urlParameters; } return $xlink; |