From b905b1b4bc5d0bde06edc9ca96ff42e8c4c4caa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 7 Oct 2021 16:09:32 +0200
Subject: [PATCH] FIX missing filter status=1 on rss feeds

---
 htdocs/website/class/websitepage.class.php | 6 +++---
 htdocs/website/samples/wrapper.php         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 16053069d30..1d0e0afdf12 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -416,9 +416,9 @@ class WebsitePage extends CommonObject
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
+				if ($key == 't.rowid' || $key == 'rowid' || $key == 't.fk_website' || $key == 'fk_website' || $key == 'status' || $key == 't.status') {
 					$sqlwhere[] = $key.' = '.((int) $value);
-				} elseif ($key == 'type_container') {
+				} elseif ($key == 'type_container' || $key == 't.type_container') {
 					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
@@ -436,7 +436,7 @@ class WebsitePage extends CommonObject
 					}
 					$sqlwhere[] = $stringtouse;
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 34f6db8d044..26adb3ef220 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -104,7 +104,7 @@ if ($rss) {
 
 	$website->fetch('', $websitekey);
 
-	$filters = array('type_container'=>'blogpost');
+	$filters = array('type_container'=>'blogpost', 'status'=>1);
 	if ($l) {
 		$filters['lang'] = $l;
 	}