L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-33831 fix E_STRICT issues in glossary

Browse Source
This commit is contained in:
Petr Škoda
2012-06-19 13:57:11 +02:00
parent 85c4758c5a
commit 9bba13089d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/import.php
+2 -2
View 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]['#']) ) {
mod/glossary/lib.php
+2
View 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;