aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-07-17 15:57:28 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-07-17 15:57:28 +0200
commitf2a1fbadbc78d235df2c0edee2804e9b18b19f9b (patch)
tree66f440ff55ae5948ea6dfcad0c7135f314a87d28 /phpBB/phpbb
parentd3f017c149bba070c6392d9f86de360653b2594c (diff)
parente8454e018de50156c5aca9e5b7d359c63cd2498b (diff)
downloadforums-f2a1fbadbc78d235df2c0edee2804e9b18b19f9b.tar
forums-f2a1fbadbc78d235df2c0edee2804e9b18b19f9b.tar.gz
forums-f2a1fbadbc78d235df2c0edee2804e9b18b19f9b.tar.bz2
forums-f2a1fbadbc78d235df2c0edee2804e9b18b19f9b.tar.xz
forums-f2a1fbadbc78d235df2c0edee2804e9b18b19f9b.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/search/base.php46
1 files changed, 0 insertions, 46 deletions
diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php
index 30781975d8..d9313dddab 100644
--- a/phpBB/phpbb/search/base.php
+++ b/phpBB/phpbb/search/base.php
@@ -37,52 +37,6 @@ class base
}
/**
- * Retrieves a language dependend list of words that should be ignored by the search
- */
- function get_ignore_words()
- {
- if (!sizeof($this->ignore_words))
- {
- global $user, $phpEx;
-
- $words = array();
-
- if (file_exists("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx"))
- {
- // include the file containing ignore words
- include("{$user->lang_path}{$user->lang_name}/search_ignore_words.$phpEx");
- }
-
- $this->ignore_words = $words;
- unset($words);
- }
- }
-
- /**
- * Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them
- */
- function get_synonyms()
- {
- if (!sizeof($this->match_synonym))
- {
- global $user, $phpEx;
-
- $synonyms = array();
-
- if (file_exists("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx"))
- {
- // include the file containing synonyms
- include("{$user->lang_path}{$user->lang_name}/search_synonyms.$phpEx");
- }
-
- $this->match_synonym = array_keys($synonyms);
- $this->replace_synonym = array_values($synonyms);
-
- unset($synonyms);
- }
- }
-
- /**
* Retrieves cached search results
*
* @param string $search_key an md5 string generated from all the passed search options to identify the results