Merge branch 'master' into stable

1 files changed, 4 insertions, 4 deletions

diff --git a/inc/actions.php b/inc/actions.php
index 3e0cb1207..0a6e6d8c7 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;
 
@@ -57,7 +54,6 @@ function act_dispatch(){
         $ACT = act_permcheck($ACT);
 
         //register
-        $nil = array();
         if($ACT == 'register' && $_POST['save'] && register()){
             $ACT = 'login';
         }
@@ -149,6 +145,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');