Merge branch 'master' into configmgr_improvements

Conflicts:
	inc/auth.php
	inc/template.php
	lib/plugins/authad/lang/zh/settings.php
	lib/plugins/authldap/lang/en/settings.php
	lib/plugins/authldap/lang/zh/settings.php
	lib/plugins/authmysql/lang/zh/settings.php
	lib/plugins/config/settings/config.class.php
	lib/plugins/usermanager/admin.php

1 files changed, 3 insertions, 3 deletions

diff --git a/doku.php b/doku.php
index 68976ebb3..777a68df8 100644
--- a/doku.php
+++ b/doku.php
@@ -9,7 +9,7 @@
  */
 
 // update message version
-$updateVersion = 38;
+$updateVersion = 40.1;
 
 //  xdebug_start_profiling();
 
@@ -80,8 +80,8 @@ trigger_event('DOKUWIKI_STARTED', $tmp);
 //close session
 session_write_close();
 
-//do the work
-act_dispatch($ACT);
+//do the work (picks up what to do from global env)
+act_dispatch();
 
 $tmp = array(); // No event data
 trigger_event('DOKUWIKI_DONE', $tmp);