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

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index d81174134f0babaebafb4dac80b094f295b13aa3..af2244ac924d0f6c3d4ddf39ee7f5ee39f53f1d2 100644 (file)
--- 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);