From 74afac00b33f004aad776496f113476acca8efc5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 18 Oct 2010 22:03:03 +0200 Subject: removed deprecated index update function --- lib/exe/indexer.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lib/exe') 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); -- cgit v1.2.3 From 87e7175e210d4cb44555ac5885a0ed6aa31bf287 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 22 Oct 2010 11:29:43 +0200 Subject: disabled JS based hotkeys for next stable release FS#1958 --- lib/exe/js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/exe') 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', ); -- cgit v1.2.3 From 88c5fee2871e49eecca1ebfa90a19b1faa1d7350 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 25 Oct 2010 11:36:28 +0200 Subject: Honor allowdebug setting in lib/exe/indexer --- lib/exe/indexer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/exe') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index f9cc3158a..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; // -------------------------------------------------------------------- -- cgit v1.2.3 From de32b03e9a7d204dfbc1a9613a020c4bdcab52eb Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 26 Oct 2010 18:45:11 +0200 Subject: Fix JS error due to disabled JS based hotkeys because of FS#1958 --- lib/exe/js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/exe') diff --git a/lib/exe/js.php b/lib/exe/js.php index dbef6e073..f9682e1e9 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -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(); -- cgit v1.2.3