diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
| commit | 55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8 (patch) | |
| tree | 1bf1359fee6044a704ac8465753e3c147d61e6e3 /lib/exe/indexer.php | |
| parent | e8b9cf5ae263f3b97aaa389dddd9e7458cc0894c (diff) | |
| parent | baef77a2b52933a6dd7caf3f641ff5ce6e6164f3 (diff) | |
| download | rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.gz rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/exe/indexer.php')
| -rw-r--r-- | lib/exe/indexer.php | 9 |
1 files changed, 3 insertions, 6 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); |