diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
| commit | e6dab93a02a05a61799c1c0e56864961e8b56bba (patch) | |
| tree | 74f3c51982a8455ee1741af4127b69562f6bcde6 /phpBB/includes/search | |
| parent | f610ed82cbf0df2b5f8afd6ca3f88b9313281036 (diff) | |
| download | forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.gz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.bz2 forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.xz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.zip | |
- 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
Diffstat (limited to 'phpBB/includes/search')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 7edfedc424..bd15f86334 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -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++) |