MDL-22054 the last blockname removed

diff --git a/blocks/glossary_random/edit_form.php b/blocks/glossary_random/edit_form.php
index 5e2f0b4..e1ca373 100644 (file)
--- a/blocks/glossary_random/edit_form.php
+++ b/blocks/glossary_random/edit_form.php
@@ -37,7 +37,7 @@ class block_glossary_random_edit_form extends block_edit_form {
         $mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
 
         $mform->addElement('text', 'config_title', get_string('title', 'block_glossary_random'));
-        $mform->setDefault('config_title', get_string('blockname','block_glossary_random'));
+        $mform->setDefault('config_title', get_string('pluginname','block_glossary_random'));
         $mform->setType('config_title', PARAM_MULTILANG);
 
         // Select glossaries to put in dropdown box ...

diff --git a/blocks/search/config_global.html b/blocks/search/config_global.html
index 2b6a1fa..643b939 100644 (file)
--- a/blocks/search/config_global.html
+++ b/blocks/search/config_global.html
@@ -272,7 +272,7 @@ if ($blocks = $DB->get_records_select('block', "name $searchable_list", $params,
         echo "<input type=\"checkbox\" name=\"search_in_{$block->name}\" value=\"1\" {$checked} />";
 
         // multiple fallback strategy to get the name of the block
-        $blocklabel = get_string('blockname', 'block_'.$block->name);
+        $blocklabel = get_string('pluginname', 'block_'.$block->name);
         if ($blocklabel == '[[blockname]]') $blocklabel = get_string($block->name, 'block_'.$block->name);
         if ($blocklabel == "[[{$block->name}]]") $blocklabel = "<span class=\"dimmed_text\">$block->name</span>";
         echo " - ".$blocklabel.'<br/>';

diff --git a/blocks/section_links/block_section_links.php b/blocks/section_links/block_section_links.php
index f038849..8d68825 100644 (file)
--- a/blocks/section_links/block_section_links.php
+++ b/blocks/section_links/block_section_links.php
@@ -40,7 +40,7 @@ class block_section_links extends block_base {
             } else if ($course->format == 'weeks') {
                 $this->title = get_string('weeks', 'block_section_links');
             } else {
-                $this->title = get_string('blockname', 'block_section_links');
+                $this->title = get_string('pluginname', 'block_section_links');
             }
         }
     }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 06e10c5..2913987 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5905,7 +5905,7 @@ class amos_string_manager implements string_manager {
         $string = $this->load_component_strings($component, $lang);
 
         if (!isset($string[$identifier])) {
-            if ($identifier !== 'parentlanguage' and $identifier !== 'blockname' and strpos($component, 'format_') !== 0 and $component !== 'pix') {
+            if ($identifier !== 'parentlanguage' and strpos($component, 'format_') !== 0 and $component !== 'pix') {
                 debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
             }
             return "[[$identifier]]";

diff --git a/search/stats.php b/search/stats.php
index 093b8fc..37b0a35 100644 (file)
--- a/search/stats.php
+++ b/search/stats.php
@@ -153,7 +153,7 @@ require_once($CFG->dirroot.'/search/lib.php');
         if ($type->type == 'mod'){
             $table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('modulenameplural', $type->name)."'", $type->records);
         } else if ($type->type == 'block') {
-            $table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('blockname', $type->name)."'", $type->records);
+            $table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('pluginname', $type->name)."'", $type->records);
         } else {
             $table->data[] = array(get_string('documentsfor', 'search') . " '".get_string($type->name)."'", $type->records);
         }