Skip to content

[imp] Changing minimum upper limit search to 200 characters #5121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 17, 2014
Merged

[imp] Changing minimum upper limit search to 200 characters #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b81de47
[imp] Changing minimum upper limit search to 200 characters
infograf768 Nov 16, 2014
c65c960
drop the else, thanks Chris
infograf768 Nov 16, 2014
47108da
Correcting test. Thanks dgt41
infograf768 Nov 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions libraries/joomla/language/language.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,20 +577,18 @@ public function setLowerLimitSearchWordCallback($function)
/**
* Returns an upper limit integer for length of search words
*
* @return integer The upper limit integer for length of search words (20 if no value was set for a specific language).
* @return integer The upper limit integer for length of search words (200 if no value was set or if default value is < 200).
*
* @since 11.1
*/
public function getUpperLimitSearchWord()
{
if ($this->upperLimitSearchWordCallback !== null)
if ($this->upperLimitSearchWordCallback !== null && call_user_func($this->upperLimitSearchWordCallback) > 200)
{
return call_user_func($this->upperLimitSearchWordCallback);
}
else
{
return 20;
}

return 200;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/suites/libraries/joomla/language/JLanguageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public function testGetUpperLimitSearchWord()
$lang = new JLanguage('');

$this->assertEquals(
20,
200,
$lang->getUpperLimitSearchWord(),
'Line: ' . __LINE__
);
Expand Down