From 8819fbf54acaf5ba3ac9f899c893a56a14144c99 Mon Sep 17 00:00:00 2001 From: hArpanet Date: Fri, 20 Sep 2013 17:41:55 +0100 Subject: Bugfix: DOKU_CONF path in pageutils.php Remove extraneous slash. This extra slash was preventing the file being displayed by DokuWiki. (apologies for the two pulls instead of one) --- inc/pageutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/pageutils.php') diff --git a/inc/pageutils.php b/inc/pageutils.php index 5043d2263..bf79daa7d 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -366,7 +366,7 @@ function mediaFN($id, $rev=''){ */ function localeFN($id,$ext='txt'){ global $conf; - $file = DOKU_CONF.'/lang/'.$conf['lang'].'/'.$id.'.'.$ext; + $file = DOKU_CONF.'lang/'.$conf['lang'].'/'.$id.'.'.$ext; if(!@file_exists($file)){ $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.'.$ext; if(!@file_exists($file)){ -- cgit v1.2.3 From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:04:01 +0100 Subject: replace boolean conditional checks on possibly uninitialized vars with \!empty/empty/isset as appropriate --- inc/pageutils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/pageutils.php') diff --git a/inc/pageutils.php b/inc/pageutils.php index bf79daa7d..60f326e04 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -396,7 +396,7 @@ function resolve_id($ns,$id,$clean=true){ // if the id starts with a dot we need to handle the // relative stuff - if($id{0} == '.'){ + if($id && $id{0} == '.'){ // normalize initial dots without a colon $id = preg_replace('/^(\.+)(?=[^:\.])/','\1:',$id); // prepend the current namespace -- cgit v1.2.3 From c8bbb09431bd7819e045a455a4ec4d85eff781b1 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Nov 2013 01:08:27 +0000 Subject: removed deprecated third param of cleanID() --- inc/pageutils.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'inc/pageutils.php') diff --git a/inc/pageutils.php b/inc/pageutils.php index 60f326e04..c8d3cf4bb 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -94,9 +94,8 @@ function getID($param='id',$clean=true){ * @author Andreas Gohr * @param string $raw_id The pageid to clean * @param boolean $ascii Force ASCII - * @param boolean $media DEPRECATED */ -function cleanID($raw_id,$ascii=false,$media=false){ +function cleanID($raw_id,$ascii=false){ global $conf; static $sepcharpat = null; -- cgit v1.2.3