diff options
| -rw-r--r-- | inc/pageutils.php | 16 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index c8d3cf4bb..20fe54a8e 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -432,9 +432,9 @@ function resolve_id($ns,$id,$clean=true){ * * @author Andreas Gohr <andi@splitbrain.org> */ -function resolve_mediaid($ns,&$page,&$exists){ +function resolve_mediaid($ns,&$page,&$exists,$rev='' ){ $page = resolve_id($ns,$page); - $file = mediaFN($page); + $file = mediaFN($page,$rev); $exists = @file_exists($file); } @@ -443,7 +443,7 @@ function resolve_mediaid($ns,&$page,&$exists){ * * @author Andreas Gohr <andi@splitbrain.org> */ -function resolve_pageid($ns,&$page,&$exists){ +function resolve_pageid($ns,&$page,&$exists,$rev='' ){ global $conf; global $ID; $exists = false; @@ -463,20 +463,20 @@ function resolve_pageid($ns,&$page,&$exists){ $page = resolve_id($ns,$page,false); // resolve but don't clean, yet // get filename (calls clean itself) - $file = wikiFN($page); + $file = wikiFN($page,$rev); // if ends with colon or slash we have a namespace link if(in_array(substr($page,-1), array(':', ';')) || ($conf['useslash'] && substr($page,-1) == '/')){ - if(page_exists($page.$conf['start'])){ + if(page_exists($page.$conf['start'],$rev)){ // start page inside namespace $page = $page.$conf['start']; $exists = true; - }elseif(page_exists($page.noNS(cleanID($page)))){ + }elseif(page_exists($page.noNS(cleanID($page),$rev))){ // page named like the NS inside the NS $page = $page.noNS(cleanID($page)); $exists = true; - }elseif(page_exists($page)){ + }elseif(page_exists($page,$rev)){ // page like namespace exists $page = $page; $exists = true; @@ -493,7 +493,7 @@ function resolve_pageid($ns,&$page,&$exists){ }else{ $try = $page.'s'; } - if(page_exists($try)){ + if(page_exists($try,$rev)){ $page = $try; $exists = true; } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 0d5881aa0..73de507b5 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -589,7 +589,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $default = $this->_simpleTitle($id); // now first resolve and clean up the $id - resolve_pageid(getNS($ID),$id,$exists); + resolve_pageid(getNS($ID),$id,$exists,$this->date_at); $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype); if ( !$isImage ) { @@ -788,7 +788,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $height=null, $cache=null, $linking=null, $return=NULL) { global $ID; list($src,$hash) = explode('#',$src,2); - resolve_mediaid(getNS($ID),$src, $exists); + resolve_mediaid(getNS($ID),$src, $exists,$this->date_at); $noLink = false; $render = ($linking == 'linkonly') ? false : true; @@ -1231,7 +1231,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { // see internalmedia() and externalmedia() list($img['src'],$hash) = explode('#',$img['src'],2); if ($img['type'] == 'internalmedia') { - resolve_mediaid(getNS($ID),$img['src'],$exists); + resolve_mediaid(getNS($ID),$img['src'],$exists,$this->date_at); } return $this->_media($img['src'], |