merge master in branch

1 files changed, 4 insertions, 4 deletions

diff --git a/doku.php b/doku.php
index 607303ca4..777a68df8 100644
--- a/doku.php
+++ b/doku.php
@@ -9,7 +9,7 @@
  */
 
 // update message version
-$updateVersion = 38;
+$updateVersion = 40.1;
 
 //  xdebug_start_profiling();
 
@@ -29,7 +29,7 @@ if(isset($_SERVER['HTTP_X_DOKUWIKI_DO'])) {
 require_once(DOKU_INC.'inc/init.php');
 
 //import variables
-$_REQUEST['id'] = str_replace("\xC2\xAD", '', $INPUT->str('id')); //soft-hyphen
+$INPUT->set('id', str_replace("\xC2\xAD", '', $INPUT->str('id'))); //soft-hyphen
 $QUERY          = trim($INPUT->str('id'));
 $ID             = getID();
 
@@ -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);