From b81de47c14f5af7c439dd80f0487bb1745b9b0ef Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sun, 16 Nov 2014 11:58:29 +0100 Subject: [PATCH 1/3] [imp] Changing minimum upper limit search to 200 characters --- libraries/joomla/language/language.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php index d5dbebd003d3b..41e45264b6d14 100644 --- a/libraries/joomla/language/language.php +++ b/libraries/joomla/language/language.php @@ -577,19 +577,19 @@ 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; } } From c65c9609e4e24b591700013627735740e877b8ca Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sun, 16 Nov 2014 12:08:10 +0100 Subject: [PATCH 2/3] drop the else, thanks Chris --- libraries/joomla/language/language.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php index 41e45264b6d14..8e87191f965ca 100644 --- a/libraries/joomla/language/language.php +++ b/libraries/joomla/language/language.php @@ -587,10 +587,8 @@ public function getUpperLimitSearchWord() { return call_user_func($this->upperLimitSearchWordCallback); } - else - { - return 200; - } + + return 200; } /** From 47108dac9b26d0ea749bb7ef5624d93e5577c1b2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Sun, 16 Nov 2014 19:32:03 +0100 Subject: [PATCH 3/3] Correcting test. Thanks dgt41 --- tests/unit/suites/libraries/joomla/language/JLanguageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/suites/libraries/joomla/language/JLanguageTest.php b/tests/unit/suites/libraries/joomla/language/JLanguageTest.php index 86151cf978b99..f90cc7ee7b067 100644 --- a/tests/unit/suites/libraries/joomla/language/JLanguageTest.php +++ b/tests/unit/suites/libraries/joomla/language/JLanguageTest.php @@ -558,7 +558,7 @@ public function testGetUpperLimitSearchWord() $lang = new JLanguage(''); $this->assertEquals( - 20, + 200, $lang->getUpperLimitSearchWord(), 'Line: ' . __LINE__ );