From c1ddac83b3e08fb3a85afee4af2e422606e1a839 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 29 Jan 2011 19:37:56 +0100 Subject: [PATCH] MDL-26104 fix blocknameconflict component in get_string() creadit goes to Howard Miller --- lib/upgradelib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/upgradelib.php b/lib/upgradelib.php index 1ec90fad4ac..81de9b7bd04 100644 --- a/lib/upgradelib.php +++ b/lib/upgradelib.php @@ -668,7 +668,7 @@ function upgrade_plugins_blocks($startcallback, $endcallback, $verbose) { if ($conflictblock !== false) { // Duplicate block titles are not allowed, they confuse people // AND PHP's associative arrays ;) - throw new plugin_defective_exception($component, get_string('blocknameconflict', '', (object)array('name'=>$block->name, 'conflict'=>$conflictblock))); + throw new plugin_defective_exception($component, get_string('blocknameconflict', 'error', (object)array('name'=>$block->name, 'conflict'=>$conflictblock))); } $startcallback($component, true, $verbose); -- 2.36.1