From 6c7843b5addbca9ae2dc1d9d19be8d67663eb8e5 Mon Sep 17 00:00:00 2001
From: andi <andi@splitbrain.org>
Date: Fri, 29 Apr 2005 22:53:20 +0200
Subject: added internal rewriting

darcs-hash:20050429205320-9977f-6bf54f3b022104a0a9aefa882dfba09a98bc9c2a.gz
---
 inc/common.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'inc/common.php')

diff --git a/inc/common.php b/inc/common.php
index 8cfe4eea8..84c6bded4 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -183,6 +183,9 @@ function idfilter($id,$ue=true){
 /**
  * This builds a link to a wikipage
  *
+ * It handles URL rewriting and adds additional parameter if
+ * given in $more
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function wl($id='',$more='',$abs=false){
@@ -196,12 +199,15 @@ function wl($id='',$more='',$abs=false){
     $xlink = DOKU_BASE;
   }
 
-  if(!$conf['userewrite']){
-    $xlink .= DOKU_SCRIPT.'?id='.$id;
-    if($more) $xlink .= '&amp;'.$more;
-  }else{
+  if($conf['userewrite'] == 2){
+    $xlink .= DOKU_SCRIPT.'/'.$id;
+    if($more) $xlink .= '?'.$more;
+  }elseif($conf['userewrite']){
     $xlink .= $id;
     if($more) $xlink .= '?'.$more;
+  }else{
+    $xlink .= DOKU_SCRIPT.'?id='.$id;
+    if($more) $xlink .= '&amp;'.$more;
   }
   
   return $xlink;
-- 
cgit v1.2.3