MDL-33831 fix E_STRICT issues in glossary
authorPetr Škoda <commits@skodak.org>
Tue, 19 Jun 2012 11:57:11 +0000 (13:57 +0200)
committerPetr Škoda <commits@skodak.org>
Tue, 19 Jun 2012 11:57:11 +0000 (13:57 +0200)
mod/glossary/import.php
mod/glossary/lib.php

index cc411dd..66466dd 100644 (file)
@@ -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]['#']) ) {
index 0a05ec7..e2332be 100644 (file)
@@ -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;