moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-70066 badges: change usages of array_key_exists to isset

Browse source
This commit is contained in:
Simey Lameze 2020-10-30 07:17:43 +08:00
parent a3f72b3972
commit 06a4390060
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
badges/classes/external/assertion_exporter.php vendored
View file

@ -104,16 +104,16 @@ class assertion_exporter extends exporter {
global $DB;
$result = [];
if (array_key_exists('related_badge', $this->data)) {
$exporter = new badgeclass_exporter($this->data['related_badge'], $this->related);
if (property_exists($this->data, 'related_badge')) {
$exporter = new badgeclass_exporter($this->data->related_badge, $this->related);
$result['badge'] = $exporter->export($output);
}
if (array_key_exists('related_recipient', $this->data)) {
$exporter = new recipient_exporter($this->data['related_recipient'], $this->related);
if (property_exists($this->data, 'related_recipient')) {
$exporter = new recipient_exporter($this->data->related_recipient, $this->related);
$result['recipient'] = $exporter->export($output);
}
if (array_key_exists('related_verify', $this->data)) {
$exporter = new verification_exporter($this->data['related_verify'], $this->related);
if (property_exists($this->data, 'related_verify')) {
$exporter = new verification_exporter($this->data->related_verify, $this->related);
$result['verification'] = $exporter->export($output);
}
return $result;

16
badges/classes/external/badgeclass_exporter.php vendored
View file

@ -54,28 +54,28 @@ class badgeclass_exporter extends exporter {
$isarray = true;
}
$prefixed = 'related_' . $one;
if (array_key_exists($one, $data) && !array_key_exists($one, $related)) {
if (property_exists($data, $one) && !array_key_exists($one, $related)) {
if ($isarray) {
$newrelated = [];
foreach ($data[$one] as $item) {
foreach ($data->$one as $item) {
$newrelated[] = (object) $item;
}
$related[$one] = $newrelated;
} else {
$related[$one] = (object) $data[$one];
$related[$one] = (object) $data->$one;
}
unset($data[$one]);
} else if (array_key_exists($prefixed, $data) && !array_key_exists($one, $related)) {
unset($data->$one);
} else if (property_exists($data, $prefixed) && !array_key_exists($one, $related)) {
if ($isarray) {
$newrelated = [];
foreach ($data[$prefixed] as $item) {
foreach ($data->$prefixed as $item) {
$newrelated[] = (object) $item;
}
$related[$one] = $newrelated;
} else {
$related[$one] = (object) $data[$prefixed];
$related[$one] = (object) $data->$prefixed;
}
unset($data[$prefixed]);
unset($data->$prefixed);
} else if (!array_key_exists($one, $related)) {
$related[$one] = null;
}