mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
- urlencoded usernames don't need htmlspecialchars [Bug #8794]
- fulltext_mysql still used synonyms/ignore words [Bug #5405] - merge tool extend to allow merging complete topics via quickmod and mcp_forum [Bug #5293] - renamed "fork" to "copy" (was already called "copy" in some places) - Copied posts should not increase post count, and should also not decrease it on deletion [Bug #8072] git-svn-id: file:///svn/phpbb/trunk@7261 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -114,9 +114,6 @@ class fulltext_mysql extends search_backend
|
||||
{
|
||||
global $config;
|
||||
|
||||
$this->get_ignore_words();
|
||||
$this->get_synonyms();
|
||||
|
||||
if ($terms == 'all')
|
||||
{
|
||||
$match = array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#');
|
||||
@@ -171,18 +168,6 @@ class fulltext_mysql extends search_backend
|
||||
$this->split_words = $matches[1];
|
||||
}
|
||||
|
||||
|
||||
if (sizeof($this->ignore_words))
|
||||
{
|
||||
$this->common_words = array_intersect($this->split_words, $this->ignore_words);
|
||||
$this->split_words = array_diff($this->split_words, $this->ignore_words);
|
||||
}
|
||||
|
||||
if (sizeof($this->replace_synonym))
|
||||
{
|
||||
$this->split_words = str_replace($this->replace_synonym, $this->match_synonym, $this->split_words);
|
||||
}
|
||||
|
||||
foreach ($this->split_words as $i => $word)
|
||||
{
|
||||
$clean_word = preg_replace('#^[+\-|]#', '', $word);
|
||||
@@ -214,9 +199,6 @@ class fulltext_mysql extends search_backend
|
||||
{
|
||||
global $config;
|
||||
|
||||
$this->get_ignore_words();
|
||||
$this->get_synonyms();
|
||||
|
||||
// Split words
|
||||
if ($this->pcre_properties)
|
||||
{
|
||||
@@ -255,16 +237,6 @@ class fulltext_mysql extends search_backend
|
||||
$text = $matches[1];
|
||||
}
|
||||
|
||||
if (sizeof($this->ignore_words))
|
||||
{
|
||||
$text = array_diff($text, $this->ignore_words);
|
||||
}
|
||||
|
||||
if (sizeof($this->replace_synonym))
|
||||
{
|
||||
$text = str_replace($this->replace_synonym, $this->match_synonym, $text);
|
||||
}
|
||||
|
||||
// remove too short or too long words
|
||||
$text = array_values($text);
|
||||
for ($i = 0, $n = sizeof($text); $i < $n; $i++)
|
||||
|
Reference in New Issue
Block a user