MDL-22054 converting block name strings to pluginname

AMOS START
 MOV [blockname,block_tag_flickr],[pluginname,block_tag_flickr]
AMOS END

diff --git a/blocks/tag_flickr/block_tag_flickr.php b/blocks/tag_flickr/block_tag_flickr.php
index 9ceff59..6dc97ce 100644 (file)
--- a/blocks/tag_flickr/block_tag_flickr.php
+++ b/blocks/tag_flickr/block_tag_flickr.php
@@ -9,7 +9,7 @@ define('DEFAULT_NUMBER_OF_PHOTOS', 6);
 class block_tag_flickr extends block_base {
 
     function init() {
-        $this->title = get_string('defaulttile','block_tag_flickr');
+        $this->title = get_string('pluginname','block_tag_flickr');
         $this->version = 2007101509;
     }
 
@@ -18,7 +18,7 @@ class block_tag_flickr extends block_base {
     }
 
     function specialization() {
-        $this->title = !empty($this->config->title) ? $this->config->title : get_string('blockname', 'block_tag_flickr');
+        $this->title = !empty($this->config->title) ? $this->config->title : get_string('pluginname', 'block_tag_flickr');
     }
 
     function instance_allow_multiple() {

diff --git a/blocks/tag_flickr/lang/en/block_tag_flickr.php b/blocks/tag_flickr/lang/en/block_tag_flickr.php
index 14d26ea..d348411 100644 (file)
--- a/blocks/tag_flickr/lang/en/block_tag_flickr.php
+++ b/blocks/tag_flickr/lang/en/block_tag_flickr.php
@@ -23,7 +23,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['blockname'] = 'Flickr';
 $string['configtitle'] = 'Title';
 $string['date-posted-asc'] = 'Date Posted ASC';
 $string['date-posted-desc'] = 'Date Posted DESC';
@@ -35,5 +34,6 @@ $string['includerelatedtags'] = 'Include related tags in query';
 $string['interestingness-asc'] = 'Interestingness ASC';
 $string['interestingness-desc'] = 'Interestingness DESC';
 $string['numberofphotos'] = 'Number of photos';
+$string['pluginname'] = 'Flickr';
 $string['relevance'] = 'Relevance';
 $string['sortby'] = 'Sort by';