mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-28473 fix $instanceids troubles in blocks upgrade
Credit goes to Mateusz Wójcik.
This commit is contained in:
parent
3fdc622697
commit
79cfcd3f7d
1 changed files with 5 additions and 3 deletions
|
@ -2121,7 +2121,7 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
|
|||
$instanceids[] = $blockinstance->id;
|
||||
// If we have more than 1000 block instances now remove all block positions
|
||||
// and empty the array
|
||||
if (count($contextids) > 1000) {
|
||||
if (count($instanceids) > 1000) {
|
||||
$instanceidstring = join(',',$instanceids);
|
||||
$DB->delete_records_select('block_positions', 'blockinstanceid IN ('.$instanceidstring.')');
|
||||
$instanceids = array();
|
||||
|
@ -2131,8 +2131,10 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
|
|||
|
||||
upgrade_cleanup_unwanted_block_contexts($contextids);
|
||||
|
||||
if ($instanceids) {
|
||||
$instanceidstring = join(',',$instanceids);
|
||||
$DB->delete_records_select('block_positions', 'blockinstanceid IN ('.$instanceidstring.')');
|
||||
}
|
||||
|
||||
unset($allblockinstances);
|
||||
unset($contextids);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue