From 4cf7f68b6cbc3d3b7d2d9c9d0655468690f9214b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 14 May 2020 18:44:05 +0200
Subject: [PATCH] Fix search on pages

---
 htdocs/website/class/websitepage.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index c63823f51a1..3e518d4d633 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -329,14 +329,23 @@ class WebsitePage extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website') {
+				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
 					$sqlwhere[] = $key.'='.$value;
+				} elseif ($key == 'type_container') {
+					$sqlwhere[] = $key."='".$value."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
+					$foundnull = 0;
 					foreach(explode(',', $value) as $tmpvalue) {
+						if ($tmpvalue == 'null') {
+							$foundnull++;
+							continue;
+						}
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
-					$sqlwhere[] = $key." IN (".join(',', $listoflang).")";
+					$stringtouse = $key." IN (".join(',', $listoflang).")";
+					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}