diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-09-29 18:29:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-09-29 18:29:20 +0200 |
| commit | 17553fca1944b80c25826f2f71620bbf64e1a49b (patch) | |
| tree | 45716d17564d0ea39cda4b0f6961b757e382c068 /lib | |
| parent | 2f981761b3f5b7c8dcc53b8026d9fd3c499a7e1e (diff) | |
| parent | 80d9f3ddb3a602960d23f1849c1ad6287c4f9d92 (diff) | |
| download | rpg-17553fca1944b80c25826f2f71620bbf64e1a49b.tar.gz rpg-17553fca1944b80c25826f2f71620bbf64e1a49b.tar.bz2 | |
Merge pull request #624 from lisps/revisions
date_at support
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/detail.php | 3 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/detail.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/exe/detail.php b/lib/exe/detail.php index cd3f362ad..cc29d5b87 100644 --- a/lib/exe/detail.php +++ b/lib/exe/detail.php @@ -5,6 +5,7 @@ require_once(DOKU_INC.'inc/init.php'); $IMG = getID('media'); $ID = cleanID($INPUT->str('id')); +$REV = $INPUT->int('rev'); // this makes some general info available as well as the info about the // "parent" page @@ -35,7 +36,7 @@ $ERROR = false; $AUTH = auth_quickaclcheck($IMG); if($AUTH >= AUTH_READ){ // check if image exists - $SRC = mediaFN($IMG); + $SRC = mediaFN($IMG,$REV); if(!@file_exists($SRC)){ //doesn't exist! http_status(404); diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 8fe2c88a2..9bd841d8c 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -49,7 +49,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); if($ERROR): echo '<h1>'.$ERROR.'</h1>'; else: ?> - + <?php if($REV) echo p_locale_xhtml('showrev');?> <h1><?php echo nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h1> <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?> |