From 55b2b31ba4b8953e4396fc55a1176293671bc638 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Jun 2007 21:15:42 +0200 Subject: fixed URL in file upload notify mail FS#1160 darcs-hash:20070613191542-7ad00-0e72b3c40f9593838641be5c4e728a8e1a68d550.gz --- inc/common.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index 673afc1a6..b47395333 100644 --- a/inc/common.php +++ b/inc/common.php @@ -368,7 +368,7 @@ function exportlink($id='',$format='raw',$more='',$abs=false,$sep='&'){ * * Will return a link to the detail page if $direct is false */ -function ml($id='',$more='',$direct=true,$sep='&'){ +function ml($id='',$more='',$direct=true,$sep='&',$abs=false){ global $conf; if(is_array($more)){ $more = buildURLparams($more,$sep); @@ -376,7 +376,11 @@ function ml($id='',$more='',$direct=true,$sep='&'){ $more = str_replace(',',$sep,$more); } - $xlink = DOKU_BASE; + if($abs){ + $xlink = DOKU_URL; + }else{ + $xlink = DOKU_BASE; + } // external URLs are always direct without rewriting if(preg_match('#^(https?|ftp)://#i',$id)){ -- cgit v1.2.3