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

Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2015-10-15 11:08:26 +01:00
parent a97cde7a6e f74fe5ba52
commit 6660fbb3d3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/log/backup/moodle2/restore_tool_log_logstore_subplugin.class.php
+4 -2
View File
@@ -105,7 +105,8 @@ abstract class restore_tool_log_logstore_subplugin extends restore_subplugin {
($mapping['restore'] === \core\event\base::NOT_MAPPED)) {
$data->objectid = \core\event\base::NOT_MAPPED;
} else {
$data->objectid = $this->get_mappingid($mapping['restore'], $data->objectid);
$data->objectid = $this->get_mappingid($mapping['restore'], $data->objectid,
\core\event\base::NOT_FOUND);
}
}
} else {
@@ -131,7 +132,8 @@ abstract class restore_tool_log_logstore_subplugin extends restore_subplugin {
($mapping['restore'] === \core\event\base::NOT_MAPPED)) {
$data->other[$key] = \core\event\base::NOT_MAPPED;
} else {
$data->other[$key] = $this->get_mappingid($mapping['restore'], $value);
$data->other[$key] = $this->get_mappingid($mapping['restore'], $value,
\core\event\base::NOT_FOUND);
}
}
}
lib/classes/event/base.php
+5
View File
@@ -80,6 +80,11 @@ abstract class base implements \IteratorAggregate {
*/
const NOT_MAPPED = -31337;
/**
* The value used when an id can not be found during a restore.
*/
const NOT_FOUND = -31338;
/** @var array event data */
protected $data;