From 78efa6afa80f9de8cb3e09d7b80eb7c1151c4c51 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 11 May 2018 10:25:42 -0400 Subject: [PATCH] HOR-4547: Classic / Task / Properties / Case Labels Warning: Declaration of XmlFormFieldTextareaPm::render($value, $owner) should be compatible with XmlFormField::render($value = NULL, $paramDummy2 = NULL) in /opt/processmaker/workflow/engine/classes/XmlFormFieldTextareaPm.php on line 86 Warning: Declaration of XmlFormFieldTextareaPm::renderGrid($owner, $values = NULL) should be compatible with XmlFormField::renderGrid($values = Array, $owner = NULL, $onlyValue = false, $therow = -1) in /opt/processmaker/workflow/engine/classes/XmlFormFieldTextareaPm.php on line 86 --- gulliver/system/class.xmlform.php | 5 ++++- workflow/engine/classes/XmlFormFieldTextareaPm.php | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 261aaddce..23a0b7059 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -384,8 +384,11 @@ class XmlFormField * @param string values * @return string */ - public function renderGrid($values = array(), $owner = null, $onlyValue = false, $therow = -1) + public function renderGrid($values = null, $owner = null, $onlyValue = false, $therow = -1) { + if ($values === null) { + $values = []; + } $result = []; $r = 1; foreach ($values as $v) { diff --git a/workflow/engine/classes/XmlFormFieldTextareaPm.php b/workflow/engine/classes/XmlFormFieldTextareaPm.php index 25b94be5c..75e42e1ca 100644 --- a/workflow/engine/classes/XmlFormFieldTextareaPm.php +++ b/workflow/engine/classes/XmlFormFieldTextareaPm.php @@ -23,7 +23,7 @@ class XmlFormFieldTextareaPm extends XmlFormField * @param eter string owner * @return string */ - public function render($value = null, $owner) + public function render($value = null, $owner = null) { if ($this->showVars == 1) { $this->process = G::replaceDataField($this->process, $owner->values); @@ -53,8 +53,11 @@ class XmlFormFieldTextareaPm extends XmlFormField * @param eter string owner * @return string */ - public function renderGrid($owner, $values = null) + public function renderGrid($owner = null, $values = null, $onlyValue = false, $therow = -1) { + if ($values === null) { + $values = []; + } $result = array(); $r = 1; foreach ($values as $v) {