From 9bba13089dacf7a7f47cad06f705ccc2127e4797 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0koda?= Date: Tue, 19 Jun 2012 13:57:11 +0200 Subject: [PATCH] MDL-33831 fix E_STRICT issues in glossary --- mod/glossary/import.php | 4 ++-- mod/glossary/lib.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/glossary/import.php b/mod/glossary/import.php index cc411dd9215..66466dd192b 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -87,7 +87,7 @@ if ($xml = glossary_read_imported_file($result)) { $xmlglossary = $xml['GLOSSARY']['#']['INFO'][0]['#']; if ( $xmlglossary['NAME'][0]['#'] ) { - unset($glossary); + $glossary = new stdClass(); $glossary->name = ($xmlglossary['NAME'][0]['#']); $glossary->course = $course->id; $glossary->globalglossary = ($xmlglossary['GLOBALGLOSSARY'][0]['#']); @@ -191,7 +191,7 @@ if ($xml = glossary_read_imported_file($result)) { for($i = 0; $i < $sizeofxmlentries; $i++) { // Inserting the entries $xmlentry = $xmlentries[$i]; - unset($newentry); + $newentry = new stdClass(); $newentry->concept = trim($xmlentry['#']['CONCEPT'][0]['#']); $newentry->definition = trusttext_strip($xmlentry['#']['DEFINITION'][0]['#']); if ( isset($xmlentry['#']['CASESENSITIVE'][0]['#']) ) { diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 0a05ec70ade..e2332be6e03 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -405,9 +405,11 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co $tmpactivity->name = format_string($cm->name, true); $tmpactivity->sectionnum = $cm->sectionnum; $tmpactivity->timestamp = $entry->timemodified; + $tmpactivity->content = new stdClass(); $tmpactivity->content->entryid = $entry->entryid; $tmpactivity->content->concept = $entry->concept; $tmpactivity->content->definition = $entry->definition; + $tmpactivity->user = new stdClass(); $tmpactivity->user->id = $entry->userid; $tmpactivity->user->firstname = $entry->firstname; $tmpactivity->user->lastname = $entry->lastname; -- 2.43.0