diff options
| author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
| commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
| tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /inc/actions.php | |
| parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 | |
Merge remote branch 'origin/master' into sitemap
Diffstat (limited to 'inc/actions.php')
| -rw-r--r-- | inc/actions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/actions.php b/inc/actions.php index 78666ec98..9db7d5f24 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -16,13 +16,10 @@ if(!defined('DOKU_INC')) die('meh.'); * @triggers ACTION_HEADERS_SEND */ function act_dispatch(){ - global $INFO; global $ACT; global $ID; global $QUERY; global $lang; - global $conf; - global $license; $preact = $ACT; @@ -62,7 +59,6 @@ function act_dispatch(){ } //register - $nil = array(); if($ACT == 'register' && $_POST['save'] && register()){ $ACT = 'login'; } @@ -154,6 +150,10 @@ function act_dispatch(){ act_redirect($ID,$preact); } + global $INFO; + global $conf; + global $license; + //call template FIXME: all needed vars available? $headers[] = 'Content-Type: text/html; charset=utf-8'; trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders'); |