diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-10-23 16:40:40 +0200 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-10-23 16:40:40 +0200 |
| commit | bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a (patch) | |
| tree | adcea7789395cf752416306f0ed6952c7f702ef8 /lib/exe | |
| parent | e3626db54846ba20cefbc1a9e2d8e29c40137067 (diff) | |
| parent | 06ce34e4a80b6875db82190eb7abfb97bfd801b8 (diff) | |
| download | rpg-bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a.tar.gz rpg-bcb79ff3b3b63c74a93cdf4762fa0cd1bb28d17a.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/indexer.php | 4 | ||||
| -rw-r--r-- | lib/exe/js.php | 2 |
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', ); |