summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/indexer.php4
-rw-r--r--lib/exe/js.php2
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index f8e2f7981..f9cc3158a 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -163,10 +163,6 @@ function runIndexer(){
}
if($conf['dperm']) chmod($lock, $conf['dperm']);
- // upgrade to version 2
- if (!@file_exists($conf['indexdir'].'/pageword.idx'))
- idx_upgradePageWords();
-
// do the work
idx_addPage($ID);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 3756c43b9..dbef6e073 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -51,7 +51,7 @@ function js_out(){
DOKU_INC.'lib/scripts/linkwiz.js',
DOKU_INC.'lib/scripts/media.js',
DOKU_INC.'lib/scripts/subscriptions.js',
- DOKU_INC.'lib/scripts/hotkeys.js',
+# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js',
DOKU_TPLINC.'script.js',
);