looks like I forgot to commit these two files :o

git-svn-id: file:///svn/phpbb/trunk@5476 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-01-19 16:38:00 +00:00
parent 38a63d94be
commit 93960a1b8e
2 changed files with 34 additions and 10 deletions

View file

@ -1,4 +1,4 @@
<?php <?php
/** /**
* *
* @package phpBB3 * @package phpBB3
@ -53,8 +53,33 @@ switch ($cron_type)
break; break;
case 'tidy_search': case 'tidy_search':
set_config('search_last_gc', time(), true); // Select the search method
break; $search_type = $config['search_type'];
if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx) || (time() - $config['search_last_gc'] <= $config['search_gc']))
{
break;
}
include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
// We do some additional checks in the module to ensure it can actually be utilised
$error = false;
$search = new $search_type($error);
if ($error)
{
break;
}
if ($use_shutdown_function)
{
register_shutdown_function(array(&$search, 'tidy'));
}
else
{
$search->tidy();
}
set_config('search_last_gc', time());
case 'tidy_database': case 'tidy_database':
include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx); include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
@ -68,7 +93,7 @@ switch ($cron_type)
tidy_database(); tidy_database();
} }
break; break;
case 'tidy_sessions': case 'tidy_sessions':
if ($use_shutdown_function) if ($use_shutdown_function)
{ {
@ -83,7 +108,7 @@ switch ($cron_type)
case 'prune_forum': case 'prune_forum':
$forum_id = request_var('f', 0); $forum_id = request_var('f', 0);
$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq $sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq
FROM ' . FORUMS_TABLE . " FROM ' . FORUMS_TABLE . "
WHERE forum_id = $forum_id"; WHERE forum_id = $forum_id";

View file

@ -564,14 +564,13 @@ CREATE TABLE phpbb_reports (
# Table: phpbb_search_results # Table: phpbb_search_results
CREATE TABLE phpbb_search_results ( CREATE TABLE phpbb_search_results (
search_id INTEGER PRIMARY KEY NOT NULL DEFAULT '0', search_key varchar(32) NOT NULL DEFAULT '',
session_id varchar(32) NOT NULL DEFAULT '',
search_time int(11) NOT NULL DEFAULT '0', search_time int(11) NOT NULL DEFAULT '0',
search_array mediumtext(16777215) NOT NULL search_keywords mediumtext(16777215) NOT NULL,
search_authors mediumtext(16777215) NOT NULL,
PRIMARY KEY (search_key)
); );
CREATE INDEX session_id_phpbb_search_result on phpbb_search_results (session_id);
# Table: phpbb_search_wordlist # Table: phpbb_search_wordlist
CREATE TABLE phpbb_search_wordlist ( CREATE TABLE phpbb_search_wordlist (
word_text varchar(50) NOT NULL DEFAULT '', word_text varchar(50) NOT NULL DEFAULT '',