diff options
| author | Michael Klier <chi@chimeric.de> | 2009-11-27 14:42:36 +0100 |
|---|---|---|
| committer | Michael Klier <chi@chimeric.de> | 2009-11-27 14:42:36 +0100 |
| commit | 202ac28bb12b2bb376b138947c43e8b72eb78091 (patch) | |
| tree | f62b4bd1e8572ff0e037568a035e5e5e5a9f1ca7 | |
| parent | f5001a3cff26438d86e88cbdde25e76c2a732e6c (diff) | |
| download | rpg-202ac28bb12b2bb376b138947c43e8b72eb78091.tar.gz rpg-202ac28bb12b2bb376b138947c43e8b72eb78091.tar.bz2 | |
added seed for css/js meta links
darcs-hash:20091127134236-23886-1b824bcf3bf98e47971ebafd577d9770f2c1d842.gz
| -rw-r--r-- | inc/template.php | 15 | ||||
| -rw-r--r-- | install.php | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/inc/template.php b/inc/template.php index 6caf3d40a..8fc70cfb8 100644 --- a/inc/template.php +++ b/inc/template.php @@ -250,6 +250,13 @@ function tpl_metaheaders($alt=true){ // prepare the head array $head = array(); + // prepare seed for js and css + $tseed = 0; + $depends = getConfigFiles('main'); + foreach($depends as $f) { + $time = @filemtime($f); + if($time > $tseed) $tseed = $time; + } // the usual stuff $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki '.getVersion() ); @@ -328,11 +335,11 @@ function tpl_metaheaders($alt=true){ // load stylesheets $head['link'][] = array('rel'=>'stylesheet', 'media'=>'all', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template'].'&tseed='.$tseed); $head['link'][] = array('rel'=>'stylesheet', 'media'=>'screen', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed); $head['link'][] = array('rel'=>'stylesheet', 'media'=>'print', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template'].'&tseed='.$tseed); // make $INFO and other vars available to JavaScripts require_once(DOKU_INC.'inc/JSON.php'); @@ -348,7 +355,7 @@ function tpl_metaheaders($alt=true){ // load external javascript $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', '_data'=>'', - 'src'=>DOKU_BASE.'lib/exe/js.php'); + 'src'=>DOKU_BASE.'lib/exe/js.php'.'?tseed='.$tseed); // trigger event here diff --git a/install.php b/install.php index 84c1523e2..5c18736e7 100644 --- a/install.php +++ b/install.php @@ -45,6 +45,7 @@ $dokuwiki_hash = array( '2007-06-26' => 'b3ca19c7a654823144119980be73cd77', '2008-05-04' => '1e5c42eac3219d9e21927c39e3240aad', '2009-02-14' => 'ec8c04210732a14fdfce0f7f6eead865', + 'devel' => '993c4b2b385643efe5abf8e7010e11f4', ); |