summaryrefslogtreecommitdiff
path: root/doku.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
committerMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
commitf77fc90de1e477b721442757cd7413f91cccc044 (patch)
tree2abb734dacf39419b96b6b70c65115de57228fc3 /doku.php
parentb8c040db1fdc0eee80963e57d95a15fd3813912d (diff)
parentbd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff)
downloadrpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz
rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2
Merge branch 'master' into indexer_rewrite
Conflicts: inc/fulltext.php inc/indexer.php lib/exe/indexer.php
Diffstat (limited to 'doku.php')
-rw-r--r--doku.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/doku.php b/doku.php
index 6cd0c0e0c..dc5e0ec66 100644
--- a/doku.php
+++ b/doku.php
@@ -27,6 +27,7 @@ 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();