Merge branch 'master' into develop

This commit is contained in:
Pierre Goiffon
2019-05-13 08:54:00 +02:00
6 changed files with 52 additions and 19 deletions

View File

@@ -743,7 +743,16 @@ try
}
else
{
$oFilter = DBSearch::unserialize($sFilter);
try
{
$oFilter = DBSearch::unserialize($sFilter);
}
catch (CoreException $e)
{
$oPage->p("Invalid query (invalid filter) : <code>$sFilter</code>");
IssueLog::Error("ajax.render operation='ajax', invalid DBSearch filter param : $sFilter");
break;
}
}
$oDisplayBlock = new DisplayBlock($oFilter, $sStyle, false);
$aExtraParams['display_limit'] = true;