From: skodak <skodak>
Date: Fri, 21 Dec 2007 09:53:00 +0000 (+0000)
Subject: MDL-12690 use the same title for block in admin tree as in blocks manage page; merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=01ca2df07a5fd2f4ff4823a1bc0569bf70d55ff2;p=moodle.git

MDL-12690 use the same title for block in admin tree as in blocks manage page; merged from MOODLE_19_STABLE
---

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index d81174134f..af2244ac92 100644
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -41,13 +41,11 @@ if ($hassiteconfig) {
         $blockbyname = array();
 
         foreach ($blocks as $block) {
-            $strblockname = get_string('blockname', 'block_'.$block->name);
-            // Deal with blocks which are lacking the language string
-            if ($strblockname == '[[blockname]]') {
-                $textlib = textlib_get_instance();
-                $strblockname = $textlib->strtotitle($block->name);
+            if(($blockobject = block_instance($block->name)) === false) {
+                // Failed to load
+                continue;
             }
-            $blockbyname[$strblockname] = $block;
+            $blockbyname[$blockobject->get_title()] = $block;
         }
         ksort($blockbyname);