diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
| commit | 8491e52805a9aaef90168f1417c6e0806fb7c5d7 (patch) | |
| tree | 536ad50878f0ac6f6815db91f8bcb4819bc092ae /inc/pageutils.php | |
| parent | 6fdd11e032b654dd27de346f7e54231ee043d7ef (diff) | |
| parent | dfaf5f6c54597f81b1a8b777f55b89c93f87a345 (diff) | |
| download | rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.gz rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into extension_manager
Diffstat (limited to 'inc/pageutils.php')
| -rw-r--r-- | inc/pageutils.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index 5043d2263..c8d3cf4bb 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -94,9 +94,8 @@ function getID($param='id',$clean=true){ * @author Andreas Gohr <andi@splitbrain.org> * @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; @@ -366,7 +365,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)){ @@ -396,7 +395,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 |