MDL-26104 fix blocknameconflict component in get_string()

creadit goes to Howard Miller
This commit is contained in:
Petr Skoda
2011-01-29 19:37:56 +01:00
parent 8cdc85ac62
commit c1ddac83b3
+1 -1
View File
@@ -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);