Merge branch 'master' into stable

Conflicts:
	data/deleted.files
	doku.php
	lib/exe/xmlrpc.php

1 files changed, 5 insertions, 1 deletions

diff --git a/doku.php b/doku.php
index 504c50e47..3e038e3e3 100644
--- a/doku.php
+++ b/doku.php
@@ -7,7 +7,7 @@
  */
 
 // update message version
-$updateVersion = 30;
+$updateVersion = 31;
 
 //  xdebug_start_profiling();
 
@@ -27,9 +27,13 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){
 require_once(DOKU_INC.'inc/init.php');
 
 //import variables
+$_REQUEST['id'] = str_replace("\xC2\xAD",'',$_REQUEST['id']); //soft-hyphen
 $QUERY = trim($_REQUEST['id']);
 $ID    = getID();
+
+// deprecated 2011-01-14
 $NS    = getNS($ID);
+
 $REV   = $_REQUEST['rev'];
 $IDX   = $_REQUEST['idx'];
 $DATE  = $_REQUEST['date'];