diff options
Diffstat (limited to 'lib/exe')
| -rw-r--r-- | lib/exe/indexer.php | 9 | ||||
| -rw-r--r-- | lib/exe/js.php | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index f8e2f7981..3a9673ed6 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -26,7 +26,8 @@ if(!$defer){ $ID = cleanID($_REQUEST['id']); // Catch any possible output (e.g. errors) -if(!isset($_REQUEST['debug'])) ob_start(); +$output = isset($_REQUEST['debug']) && $conf['allowdebug']; +if(!$output) ob_start(); // run one of the jobs $tmp = array(); // No event data @@ -42,7 +43,7 @@ if ($evt->advise_before()) { } if($defer) sendGIF(); -if(!isset($_REQUEST['debug'])) ob_end_clean(); +if(!$output) ob_end_clean(); exit; // -------------------------------------------------------------------- @@ -163,10 +164,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..f9682e1e9 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', ); @@ -117,7 +117,7 @@ function js_out(){ js_runonstart('scrollToMarker()'); js_runonstart('focusMarker()'); // init hotkeys - must have been done after init of toolbar - js_runonstart('initializeHotkeys()'); +# disabled for FS#1958 js_runonstart('initializeHotkeys()'); // end output buffering and get contents $js = ob_get_contents(); |