mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-07 01:06:48 +02:00
- finally correctly calculate current time for birthday calculation [Bug #6030]
- allow searching forums with unsearchable subforums [Bug #6056] - addition of an optional HTTP_X_FORWARDED_FOR check in sessions, including bans - do not index forums which have indexing disabled on index recreation [Bug #6060] - properly handle html entities in the theme editor [Bug #6048] - anonymous access is no longer required for the LDAP auth plugin [Bug #6046] - corrected mcp_front queue link to point to approve_details [Bug #6134] - added direct (dis)approval to mcp_front queue items [Bug #6134] - proper mysql version test for fulltext-compatibility [Bug #6054] - added note to style/language "used by" column so it's clear that bots are included - correctly update bot last visit time [Bug #6108] git-svn-id: file:///svn/phpbb/trunk@6740 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -17,7 +17,7 @@ class acp_search
|
||||
var $state;
|
||||
var $search;
|
||||
var $max_post_id;
|
||||
var $batch_size = 4000;
|
||||
var $batch_size = 5000;
|
||||
|
||||
function main($id, $mode)
|
||||
{
|
||||
@@ -320,6 +320,16 @@ class acp_search
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql = 'SELECT forum_id, enable_indexing
|
||||
FROM ' . FORUMS_TABLE;
|
||||
$result = $db->sql_query($sql, 3600);
|
||||
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$forums[$row['forum_id']] = (bool) $row['enable_indexing'];
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
|
||||
FROM ' . POSTS_TABLE . '
|
||||
WHERE post_id >= ' . (int) ($post_counter + 1) . '
|
||||
@@ -328,7 +338,10 @@ class acp_search
|
||||
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
|
||||
if ($forums[$row['forum_id']])
|
||||
{
|
||||
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
|
@@ -1121,7 +1121,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
|
||||
$s_units = '<option value=""' . (($unit == '') ? ' selected="selected"' : '') . '>' . $user->lang['NO_UNIT'] . '</option>' . $s_units;
|
||||
|
||||
$template->assign_vars(array(
|
||||
strtoupper($var) => $value,
|
||||
strtoupper($var) => htmlspecialchars($value),
|
||||
'S_' . strtoupper($var) . '_UNITS' => $s_units)
|
||||
);
|
||||
break;
|
||||
@@ -1162,7 +1162,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
|
||||
|
||||
default:
|
||||
$template->assign_vars(array(
|
||||
strtoupper($var) => $value)
|
||||
strtoupper($var) => htmlspecialchars($value))
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1226,7 +1226,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
|
||||
break;
|
||||
|
||||
default:
|
||||
$value = request_var($var, '');
|
||||
$value = htmlspecialchars_decode(request_var($var, ''));
|
||||
}
|
||||
|
||||
// use the element mapping to create raw css code
|
||||
|
Reference in New Issue
Block a user