Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop
This commit is contained in:
Laurent Destailleur 2023-03-28 20:30:32 +02:00
commit 4a0f4f15b9

View File

@ -55,6 +55,7 @@ if (! defined("NOSESSION")) {
require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php';
require_once dirname(__FILE__).'/../../htdocs/core/lib/website2.lib.php';
require_once dirname(__FILE__).'/../../htdocs/website/class/website.class.php';
if (empty($user->id)) {
@ -165,7 +166,9 @@ class WebsiteTest extends PHPUnit\Framework\TestCase
*/
public function testGetPagesFromSearchCriterias()
{
global $db;
global $db, $website;
$website = new Website($db); // $website must be defined globally for getPagesFromSearchCriterias()
$s = "123') OR 1=1-- \' xxx";
/*