diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2012-07-24 12:10:22 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2012-07-28 18:28:51 +0530 |
| commit | 2e218776bbac82841e1ced583c83890be5080af0 (patch) | |
| tree | e9f88494af50df4aead9bff68e15e7628cee7661 /phpBB/includes/search | |
| parent | 33c6d7c8be41ddd15b4e03e5dfecfd259c77b327 (diff) | |
| download | forums-2e218776bbac82841e1ced583c83890be5080af0.tar forums-2e218776bbac82841e1ced583c83890be5080af0.tar.gz forums-2e218776bbac82841e1ced583c83890be5080af0.tar.bz2 forums-2e218776bbac82841e1ced583c83890be5080af0.tar.xz forums-2e218776bbac82841e1ced583c83890be5080af0.zip | |
[ticket/11011] passing global variables
Pass global variables to class constructor when making a new object.
PHPBB3-11011
Diffstat (limited to 'phpBB/includes/search')
| -rw-r--r-- | phpBB/includes/search/fulltext_native.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index b9818d7919..a470a92458 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -342,11 +342,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base // throw an error if we shall not ignore unexistant words else if (!$ignore_no_id && sizeof($non_common_words)) { -<<<<<<< HEAD trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words))); -======= - trigger_error(sprintf($this->user->lang['WORDS_IN_NO_POST'], implode(', ', $non_common_words))); ->>>>>>> 1ee5f46... [ticket/11011] remove global keyword in native search } unset($non_common_words); } |