mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 15:16:16 +02:00
- fix a stupid bug in style.php
- and we'd also like the post encoding :D git-svn-id: file:///svn/phpbb/trunk@6153 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c6227ad5b0
commit
97cd5b1c3d
@ -319,7 +319,7 @@ class acp_search
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
|
||||
$sql = 'SELECT post_id, post_subject, post_text, post_encoding, poster_id, forum_id
|
||||
FROM ' . POSTS_TABLE . '
|
||||
WHERE post_id >= ' . (int) ($post_counter + 1) . '
|
||||
AND post_id < ' . (int) ($post_counter + $this->batch_size);
|
||||
@ -327,7 +327,7 @@ class acp_search
|
||||
|
||||
while (false !== ($row = $db->sql_fetchrow($result)))
|
||||
{
|
||||
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']);
|
||||
$this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['post_encoding'], $row['poster_id'], $row['forum_id']);
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
|
@ -1844,7 +1844,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
|
||||
trigger_error($error);
|
||||
}
|
||||
|
||||
$search->index($mode, $data['post_id'], $data['message'], $subject, $poster_id, ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']);
|
||||
$search->index($mode, $data['post_id'], $data['message'], $subject, $user->lang['ENCODING'], $poster_id, ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']);
|
||||
}
|
||||
|
||||
$db->sql_transaction('commit');
|
||||
|
@ -555,7 +555,7 @@ class fulltext_mysql extends search_backend
|
||||
*
|
||||
* @param string $mode contains the post mode: edit, post, reply, quote ...
|
||||
*/
|
||||
function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
||||
function index($mode, $post_id, &$message, &$subject, $encoding, $poster_id, $forum_id)
|
||||
{
|
||||
global $db;
|
||||
|
||||
|
@ -750,7 +750,7 @@ class fulltext_native extends search_backend
|
||||
*
|
||||
* @param string $mode contains the post mode: edit, post, reply, quote ...
|
||||
*/
|
||||
function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
|
||||
function index($mode, $post_id, &$message, &$subject, $encoding, $poster_id, $forum_id)
|
||||
{
|
||||
global $config, $db;
|
||||
|
||||
|
@ -52,7 +52,7 @@ if ($id && $sid)
|
||||
|
||||
// Include files
|
||||
require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
|
||||
require($phpbb_root_path . 'includes/acm/acm_main.' . $phpEx);
|
||||
require($phpbb_root_path . 'includes/cache.' . $phpEx);
|
||||
require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
|
||||
|
||||
$db = new $sql_db();
|
||||
|
Loading…
x
Reference in New Issue
Block a user