opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'jscachekey' 

* jscachekey:
  trigger JS_CACHE_USE in lib/exe/js.php
  added INIT_LANG_LOAD event
  let js.php use multiple caches
This commit is contained in:
Andreas Gohr 2012-03-10 15:55:05 +01:00
parent 50fbf1b652 e67004f5b6
commit 9189204ab4
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
inc/init.php
View File

@ -69,16 +69,6 @@ foreach (array('default','local','protected') as $config_group) {
}
}
//prepare language array
global $lang;
$lang = array();
//load the language files
require_once(DOKU_INC.'inc/lang/en/lang.php');
if ( $conf['lang'] && $conf['lang'] != 'en' ) {
require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
}
//prepare license array()
global $license;
$license = array();
@ -214,6 +204,10 @@ $plugin_controller = new $plugin_controller_class();
global $EVENT_HANDLER;
$EVENT_HANDLER = new Doku_Event_Handler();
$local = $conf['lang'];
trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true);
// setup authentication system
if (!defined('NOSESSION')) {
auth_setup();
@ -256,6 +250,20 @@ function init_paths(){
$conf['media_changelog'] = $conf['metadir'].'/_media.changes';
}
function init_lang($langCode) {
//prepare language array
global $lang;
$lang = array();
//load the language files
require_once(DOKU_INC.'inc/lang/en/lang.php');
if ($langCode && $langCode != 'en') {
if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) {
require_once(DOKU_INC."inc/lang/$langCode/lang.php");
}
}
}
/**
* Checks the existance of certain files and creates them if missing.
*/

8
lib/exe/js.php
View File

@ -32,8 +32,8 @@ function js_out(){
global $config_cascade;
// The generated script depends on some dynamic options
$cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],
'.js');
$cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
$cache->_event = 'JS_CACHE_USE';
// load minified version for some files
$min = $conf['compress'] ? '.min' : '';
@ -79,8 +79,8 @@ function js_out(){
// check cache age & handle conditional request
// This may exit if a cache can be used
http_cached($cache->cache,
$cache->useCache(array('files' => $cache_files)));
$cache_ok = $cache->useCache(array('files' => $cache_files));
http_cached($cache->cache, $cache_ok);
// start output buffering and build the script
ob_start();