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

2007-12-21 09:53:00 +00:00
parent 2803993c02
commit 01ca2df07a
1 changed files with 4 additions and 6 deletions
@@ -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);