From 37f005b142efc7eedd9be055e8144d73d1e54303 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 11 Apr 2010 20:50:37 +0000 Subject: [PATCH] MDL-22061 removing unnecessary [[ tests --- blocks/search/config_global.html | 2 -- lib/authlib.php | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/blocks/search/config_global.html b/blocks/search/config_global.html index 643b939e8cf..e05320d297f 100644 --- a/blocks/search/config_global.html +++ b/blocks/search/config_global.html @@ -273,8 +273,6 @@ if ($blocks = $DB->get_records_select('block', "name $searchable_list", $params, // multiple fallback strategy to get the name of the block $blocklabel = get_string('pluginname', 'block_'.$block->name); - if ($blocklabel == '[[blockname]]') $blocklabel = get_string($block->name, 'block_'.$block->name); - if ($blocklabel == "[[{$block->name}]]") $blocklabel = "$block->name"; echo " - ".$blocklabel.'
'; if ($i % 20 == 0){ echo ""; diff --git a/lib/authlib.php b/lib/authlib.php index b8f16fea982..78a4f0d8813 100644 --- a/lib/authlib.php +++ b/lib/authlib.php @@ -423,10 +423,7 @@ class auth_plugin_base { * @return string The description */ function get_description() { - $authdescription = get_string("auth_{$this->authtype}description", "auth"); - if ($authdescription == "[[auth_{$this->authtype}description]]") { - $authdescription = get_string("auth_{$this->authtype}description", "auth_{$this->authtype}"); - } + $authdescription = get_string("auth_{$this->authtype}description", "auth_{$this->authtype}"); return $authdescription; } -- 2.43.0