From be18e98197e7a73d302111b05dfd97fdb8711a11 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Mon, 5 Oct 2015 10:44:19 +0200
Subject: [PATCH] hotline #29524 remove private attribute to CNIL var

---
 library/Class/AdminVar.php                                  | 2 +-
 .../modules/admin/controllers/AdminIndexControllerTest.php  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 53527cfe81d..07d8641570a 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -163,7 +163,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
                     'TEXT_REPLACEMENTS' => Class_AdminVar_Meta::newRawText($this->_('Remplacement de textes à la volée. <br/>Ex:<br/>Panier;Sélection<br/>Vous avez %%d paniers;Vous avez %%d sélections')),
                     'URL_COSMOGRAMME' => Class_AdminVar_Meta::newDefault('')->bePrivate(),
                     'PACK_MOBILE' => Class_AdminVar_Meta::newOnOff($this->_('Activation des fonctions avancées du téléphone'))->bePrivate(),
-                    'CNIL_CONSENT_ENABLE' => Class_AdminVar_Meta::newOnOff("Affiche la demande de consentement avant l'insertion de cookies ou autres traceurs")->bePrivate()],
+                    'CNIL_CONSENT_ENABLE' => Class_AdminVar_Meta::newOnOff('Affiche la demande de consentement avant l\'insertion de cookies ou autres traceurs')],
        'catalogue' => [
                        'OAI_SERVER' => Class_AdminVar_Meta::newOnOff($this->_('Activation du serveur OAI: permet le moissonnage des domaines par d\'autres logiciels via OAI'))],
        'newsletter' => [
diff --git a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
index 8749bc6df5f..2e7562cccee 100644
--- a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
+++ b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
@@ -234,6 +234,12 @@ class AdminIndexControllerAdminVarActionAsAdminPortailTest extends Admin_Abstrac
   public function unexistingVarInDbShouldBeDisplayed() {
     $this->assertXpathContentContains('//td', 'AFFICHER_DISPONIBILITE_SUR_RECHERCHE');
   }
+
+
+  /** @test */
+  public function cnilVarShouldBeDisplay() {
+    $this->assertXPathContentContains('//td', 'CNIL_CONSENT_ENABLE');
+  }
 }
 
 
-- 
GitLab