Merge branch 'develop' into db-search-operator

This commit is contained in:
Min-Soo Kim 2020-12-27 21:24:02 +09:00 committed by GitHub
commit f8ed3b49f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 132 additions and 81 deletions

View file

@ -23,7 +23,7 @@ class integration_searchView extends integration_search
*
* @return void
*/
function init()
public function init()
{
}
@ -32,7 +32,7 @@ class integration_searchView extends integration_search
*
* @return Object
*/
function IS()
public function IS()
{
$oFile = getClass('file');
$oModuleModel = getModel('module');
@ -114,7 +114,8 @@ class integration_searchView extends integration_search
// Set a variable for search keyword
$is_keyword = Context::get('is_keyword');
$is_keyword = escape(trim(utf8_normalize_spaces($is_keyword)));
// As the variables from GET or POST will be escaped by setRequestArguments method at Context class, the double_escape variable should be "FALSE", and also the escape function might be useful when this method was called from the other way (for not escaped keyword).
$is_keyword = escape(trim(utf8_normalize_spaces($is_keyword)), false);
if (mb_strlen($is_keyword, 'UTF-8') > 250)
{
$is_keyword = mb_substr($is_keyword, 0, 250);