From 56770578f792cd8c25f15655e5f4b0f4f65f4c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 17 Aug 2016 10:04:00 +0200
Subject: [PATCH] Fixes #5074 htmlIds should be public

---
 include/simpleplugin/class_attribute.inc        | 14 +++++++-------
 include/simpleplugin/class_dialogAttributes.inc |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/simpleplugin/class_attribute.inc b/include/simpleplugin/class_attribute.inc
index a554fcde5..a1e38c244 100644
--- a/include/simpleplugin/class_attribute.inc
+++ b/include/simpleplugin/class_attribute.inc
@@ -623,7 +623,7 @@ class Attribute
     ));
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     return array($this->getHtmlId());
   }
@@ -1691,7 +1691,7 @@ class FileDownloadAttribute extends FileAttribute
     return $this->renderAcl($display);
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id   = $this->getHtmlId();
     $ids  = array('download'.$id);
@@ -1758,7 +1758,7 @@ class FileTextAreaAttribute extends FileDownloadAttribute
     return $this->renderAcl($display).parent::renderFormInput();
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $ids    = parent::htmlIds();
     $ids[]  = $id.'_text';
@@ -1898,7 +1898,7 @@ class ImageAttribute extends FileAttribute
     return $this->renderAcl($display);
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id = $this->getHtmlId();
     return array($id.'_img',$id,'upload'.$id);
@@ -2307,7 +2307,7 @@ class SetAttribute extends Attribute
     return array_values($this->value);
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id = $this->getHtmlId();
     return array_merge(array('add'.$id,'del'.$id,'row'.$id), $this->attribute->htmlIds());
@@ -2631,7 +2631,7 @@ class CompositeAttribute extends Attribute
     return $display;
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $ret = array();
     foreach ($this->attributes as &$attribute) {
@@ -2909,7 +2909,7 @@ class OrderedArrayAttribute extends SetAttribute
     }
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id   = $this->getHtmlId();
     $ids  = array('add'.$id);
diff --git a/include/simpleplugin/class_dialogAttributes.inc b/include/simpleplugin/class_dialogAttributes.inc
index 0fc798cb4..2fb432e15 100644
--- a/include/simpleplugin/class_dialogAttributes.inc
+++ b/include/simpleplugin/class_dialogAttributes.inc
@@ -223,7 +223,7 @@ class DialogAttribute extends SetAttribute
     return $buttons;
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id = $this->getHtmlId();
     return array('add'.$id.'_dialog','del'.$id,'row'.$id);
@@ -288,7 +288,7 @@ class DialogOrderedArrayAttribute extends OrderedArrayAttribute
     );
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $ids = parent::htmlIds();
     $ids[0] .= '_dialog';
@@ -525,7 +525,7 @@ class MailsAttribute extends DialogAttribute
     return $buttons;
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $id = $this->getHtmlId();
     return array('add'.$id,'add'.$id.'_dialog','del'.$id,'row'.$id);
@@ -696,7 +696,7 @@ class UserAttribute extends DialogButtonAttribute
     }
   }
 
-  protected function htmlIds()
+  public function htmlIds()
   {
     $ids = array($this->getHtmlId());
     if (!$this->isRequired()) {
-- 
GitLab