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

Merge branch 'wip-mdl-52799-m30' of git://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
David Monllao
2016-01-25 14:39:46 +08:00
parent 3ab644e94e 974ccb5121
commit da3aaf3a63
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/testing/classes/util.php
+7 -4
View File
@@ -638,7 +638,11 @@ abstract class testing_util {
foreach ($data as $table => $records) {
if ($borkedmysql) {
if (empty($records) and isset($empties[$table])) {
if (empty($records)) {
if (!isset($empties[$table])) {
// Table has been modified and is not empty.
$DB->delete_records($table, null);
}
continue;
}
@@ -660,9 +664,8 @@ abstract class testing_util {
}
if (empty($records)) {
if (isset($empties[$table])) {
// table was not modified and is empty
} else {
if (!isset($empties[$table])) {
// Table has been modified and is not empty.
$DB->delete_records($table, array());
}
continue;