From: Petr Skoda <commits@skodak.org>
Date: Sat, 29 Jan 2011 18:37:56 +0000 (+0100)
Subject: MDL-26104 fix blocknameconflict component in get_string()
X-Git-Tag: v2.0.2~129^2
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c1ddac83b3e08fb3a85afee4af2e422606e1a839

MDL-26104 fix blocknameconflict component in get_string()

creadit goes to Howard Miller
---

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);