summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2013-03-03 18:34:33 +0000
committerChristopher Smith <chris@jalakai.co.uk>2013-03-03 18:34:33 +0000
commitb613287149ac4707ec40a96b1b6fe8b190fa6439 (patch)
tree9e336fcf3f544fed1bef1d54632642a2c520559f /lib/exe
parentca22711e6b0caa2525d6134c28bf0af78e8fcda3 (diff)
downloadrpg-b613287149ac4707ec40a96b1b6fe8b190fa6439.tar.gz
rpg-b613287149ac4707ec40a96b1b6fe8b190fa6439.tar.bz2
include image info in in detail.php; ensure populated before DETAIL_STARTED event
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/detail.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index db635c016..7008b126f 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -2,13 +2,18 @@
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
define('DOKU_MEDIADETAIL',1);
require_once(DOKU_INC.'inc/init.php');
-trigger_event('DETAIL_STARTED', $tmp=array());
-//close session
-session_write_close();
$IMG = getID('media');
$ID = cleanID($INPUT->str('id'));
+// this makes some general infos available as well as the info about the
+// "parent" page
+$INFO = array_merge(pageinfo(),mediainfo());
+trigger_event('DETAIL_STARTED', $tmp=array());
+
+//close session
+session_write_close();
+
if($conf['allowdebug'] && $INPUT->has('debug')){
print '<pre>';
foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
@@ -39,10 +44,6 @@ if($AUTH >= AUTH_READ){
$ERROR = p_locale_xhtml('denied');
}
-// this makes some general infos available as well as the info about the
-// "parent" page
-$INFO = pageinfo();
-
//start output and load template
header('Content-Type: text/html; charset=utf-8');
include(template('detail.php'));