1 files changed, 5 insertions, 12 deletions

diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index a677db276..f6e186cdb 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -28,8 +28,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     // @access public
     var $doc = '';        // will contain the whole document
     var $toc = array();   // will contain the Table of Contents
-    var $rev = '';
-    var $date_at = '';
+    var $date_at = '';    // link pages and media against this revision
 
     var $sectionedits = array(); // A stack of section edit data
     private $lastsecid = 0; // last section edit id, used by startSectionEdit
@@ -622,8 +621,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         $link['class']  = $class;
         if($this->date_at) {
             $params['at'] = $this->date_at;
-        } else if($this->rev) {
-            //$params['at'] = $this->rev;
         }
         $link['url']    = wl($id, $params);
         $link['name']   = $name;
@@ -799,7 +796,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
         list($ext,$mime,$dl) = mimetype($src,false);
         if(substr($mime,0,5) == 'image' && $render){
-            if(($this->rev||$this->date_at)) {
+            if($this->date_at) {
                 $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache,'rev'=>$this->_getProperMediaRevision($src)),($linking=='direct'));
             } else {
                 $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
@@ -811,7 +808,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
             // add file icons
             $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
             $link['class'] .= ' mediafile mf_'.$class;
-            if(($this->rev||$this->date_at)) {
+            if($this->date_at) {
                 $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache,'rev'=>$this->_getProperMediaRevision($src)),true);
             } else {
                 $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
@@ -1088,7 +1085,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
                 return $title;
             }
             //add image tag
-            if($intern && ($this->rev||$this->date_at)) {
+            if($intern && $this->date_at) {
                 $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache,'rev'=>$this->_getProperMediaRevision($src))).'"';
             } else { 
                 $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache)).'"';
@@ -1251,11 +1248,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
      * @return string revision ('' for current) 
      */
     function _getProperMediaRevision($media_id){
-        $rev = $this->rev;
-        if($this->date_at){
-            $rev = $this->date_at;
-        }
-        return getProperRevision($media_id,$rev,true);
+        return getProperRevision($media_id,$this->date_at,true);
     }