From 6b3024b153ce88ea8f5c5e2ff27405a46b71b3d9 Mon Sep 17 00:00:00 2001 From: daraelmin Date: Wed, 28 Apr 2021 17:29:52 +0200 Subject: [PATCH 1/3] statut is not status in adherent class --- htdocs/adherents/class/adherent.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 54589a049ff..d43a139c6c7 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -208,7 +208,7 @@ class Adherent extends CommonObject // -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed // def in common object - //public $status; + public $statut = $this->status; // TODO modify to set statut as deprecated /** * @var string photo of member @@ -357,7 +357,8 @@ class Adherent extends CommonObject public function __construct($db) { $this->db = $db; - $this->statut = self::STATUS_DRAFT; // shouldn't this be $status ? + $this->statut = self::STATUS_DRAFT; + $this->status = $this->statut; // l'adherent n'est pas public par defaut $this->public = 0; // les champs optionnels sont vides From 95389b4f57a067aa999f34db3cdbbbff38c7c5de Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 28 Apr 2021 15:33:37 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index d43a139c6c7..4f0d2caa430 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -357,7 +357,7 @@ class Adherent extends CommonObject public function __construct($db) { $this->db = $db; - $this->statut = self::STATUS_DRAFT; + $this->statut = self::STATUS_DRAFT; $this->status = $this->statut; // l'adherent n'est pas public par defaut $this->public = 0; From ea5493be87aec733722b07d3481826d05d382c33 Mon Sep 17 00:00:00 2001 From: daraelmin Date: Wed, 28 Apr 2021 17:54:47 +0200 Subject: [PATCH 3/3] Update adherent.class.php --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 4f0d2caa430..7fdc548efa7 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -208,7 +208,7 @@ class Adherent extends CommonObject // -2:excluded, -1:draft, 0:resiliated, >=1:valided,payed // def in common object - public $statut = $this->status; // TODO modify to set statut as deprecated + public $statut; // TODO modify to set statut as deprecated /** * @var string photo of member