From 8620bfee90cf50aee68ce633c20b27fe2dcdd3e2 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Wed, 30 Nov 2011 08:49:18 +0100 Subject: [PATCH] MDL-30517 use alternative block delete to prevent upgrade problems --- lib/db/upgrade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index f209c40f76977..6b6573ce30008 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -6819,7 +6819,8 @@ function xmldb_main_upgrade($oldversion) { if ($dbman->table_exists($table)) { $instances = $DB->get_records('block_instances', array('blockname'=>'search')); foreach($instances as $instance) { - context_helper::delete_instance(CONTEXT_BLOCK, $instance->id); + $context = context_block::instance($instance->id); + upgrade_cleanup_unwanted_block_contexts(array($context->id)); // do not use standard block deleting MDL-30517, there is no extra stuff used in block, so this should be safe $DB->delete_records('block_positions', array('blockinstanceid' => $instance->id)); $DB->delete_records('block_instances', array('id' => $instance->id)); }