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

MDL-67307 core: Fix onject creation from empty value cases

Browse source 
The "creating default object from empty value" warning is now consistently
thrown if a falsy value is promoted into an stdClass object. Previously some
cases like `$null->prop[0] = $val` missed this warning.
This commit is contained in:
Eloy Lafuente (stronk7) 2019-11-19 18:54:46 +01:00
parent a5f618d6a9
commit 88d88bd92e
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/outputcomponents.php
View file

@ -3251,6 +3251,9 @@ class initials_bar implements renderable, templatable {
if ($letter == $this->current) { if ($letter == $this->current) {
$groupletter->selected = $this->current; $groupletter->selected = $this->current;
} }
if (!isset($data->group[$groupnumber])) {
$data->group[$groupnumber] = new stdClass();
}
$data->group[$groupnumber]->letter[] = $groupletter; $data->group[$groupnumber]->letter[] = $groupletter;
} }

2
mod/assign/locallib.php
View file

@ -2457,6 +2457,8 @@ class assign {
* @return array An array of userids * @return array An array of userids
*/ */
protected function get_grading_userid_list($cached = false, $useridlistid = '') { protected function get_grading_userid_list($cached = false, $useridlistid = '') {
global $SESSION;
if ($cached) { if ($cached) {
if (empty($useridlistid)) { if (empty($useridlistid)) {
$useridlistid = $this->get_useridlist_key_id(); $useridlistid = $this->get_useridlist_key_id();