projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-21227 Fix test following merge of PR #10435
[civicrm-core.git]
/
CRM
/
Badge
/
Form
/
Layout.php
diff --git
a/CRM/Badge/Form/Layout.php
b/CRM/Badge/Form/Layout.php
index 8ff71a23213b82e8f929ffa473a7bbdf4fa08836..ba4d20170704bfa9f2dc086b357e0b0ba2f9124a 100644
(file)
--- a/
CRM/Badge/Form/Layout.php
+++ b/
CRM/Badge/Form/Layout.php
@@
-154,7
+154,7
@@
class CRM_Badge_Form_Layout extends CRM_Admin_Form {
public function setDefaultValues() {
if (isset($this->_id)) {
$defaults = array_merge($this->_values,
public function setDefaultValues() {
if (isset($this->_id)) {
$defaults = array_merge($this->_values,
- CRM_Badge_BAO_Layout::getDecodedData(
$this->_values['data']
));
+ CRM_Badge_BAO_Layout::getDecodedData(
CRM_Utils_Array::value('data', $this->_values, '[]')
));
}
else {
for ($i = 1; $i <= self::FIELD_ROWCOUNT; $i++) {
}
else {
for ($i = 1; $i <= self::FIELD_ROWCOUNT; $i++) {