diff options
| author | Andreas Gohr <gohr@cosmocode.de> | 2009-11-03 14:40:22 +0100 |
|---|---|---|
| committer | Andreas Gohr <gohr@cosmocode.de> | 2009-11-03 14:40:22 +0100 |
| commit | 8bbcb611aa2b803e03a4d367d0d63d0829c124c2 (patch) | |
| tree | fc15341c8e90a24b3cd640625deaf07638ec1c75 | |
| parent | 463d4a65df88897c9b4c7c06f2b9dc74297c06fb (diff) | |
| download | rpg-8bbcb611aa2b803e03a4d367d0d63d0829c124c2.tar.gz rpg-8bbcb611aa2b803e03a4d367d0d63d0829c124c2.tar.bz2 | |
removed no longer parameters passed to lib/exe/js.php
Ignore-this: 2b94504f7d08ee5e17135d826cd521d0
darcs-hash:20091103134022-6e07b-ea17b4d65cae2daccdb7ad6956214a4c5c59fbe5.gz
| -rw-r--r-- | inc/template.php | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/inc/template.php b/inc/template.php index d15f25f8b..f51e2acf9 100644 --- a/inc/template.php +++ b/inc/template.php @@ -333,33 +333,24 @@ function tpl_metaheaders($alt=true){ $head['link'][] = array('rel'=>'stylesheet', 'media'=>'print', 'type'=>'text/css', 'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template']); - // make $INFO available to JavaScripts + // make $INFO and other vars available to JavaScripts require_once(DOKU_INC.'inc/JSON.php'); $json = new JSON(); $infocpy = $INFO; - $infocpy['userinfo']['login'] = $_SERVER['REMOTE_USER']; $infocpy['userinfo']['pass'] = ''; - $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', '_data'=> 'var INFO = '.$json->encode($infocpy).';'); - - - // load javascript - $js_edit = ($ACT=='edit' || $ACT=='preview' || $ACT=='recover' || $ACT=='wordblock' ) ? 1 : 0; - $js_write = ($INFO['writable']) ? 1 : 0; - if(defined('DOKU_MEDIAMANAGER')){ - $js_edit = 1; - $js_write = 0; - } - if(($js_edit && $js_write) || defined('DOKU_MEDIAMANAGER')){ - $script = "NS='".$INFO['namespace']."';"; - if($conf['useacl'] && $_SERVER['REMOTE_USER']){ + $script = "NS='".$INFO['namespace']."';"; + if($conf['useacl'] && $_SERVER['REMOTE_USER']){ require_once(DOKU_INC.'inc/toolbar.php'); $script .= "SIG='".toolbar_signature()."';"; - } - $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', - '_data'=> $script); + $infocpy['userinfo']['login'] = $_SERVER['REMOTE_USER']; } + $script .= 'var INFO = '.$json->encode($infocpy).';'; + $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', + '_data'=> $script); + + // load external javascript $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', '_data'=>'', - 'src'=>DOKU_BASE.'lib/exe/js.php?edit='.$js_edit.'&write='.$js_write); + 'src'=>DOKU_BASE.'lib/exe/js.php'); // trigger event here |