mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11011] passing global variables

Browse Source 
Pass global variables to class constructor when making a new object.

PHPBB3-11011
This commit is contained in:
Dhruv
2012-07-24 12:10:22 +05:30
parent 33c6d7c8be
commit 2e218776bb
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/search/fulltext_native.php
View File

@@ -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);
}