Merged MDL-7493 further fix: strip_tags from title strings because the titles may...

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index dd3b40607172dc2db129d1c2d9b8dd68b3e3b110..9c62c55f6c98c81f6fb6bfb6a6988503c8424c1e 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -334,8 +334,8 @@ class block_base {
         if (!empty($CFG->allowuserblockhiding)) {
             //Accessibility: added 'alt' text for the +- icon.
             //Theme the buttons using, Admin - Miscellaneous - smartpix.
-            $strshow = addslashes_js(get_string('showblocka', 'access', $this->title));
-            $strhide = addslashes_js(get_string('hideblocka', 'access', $this->title));
+            $strshow = addslashes_js(get_string('showblocka', 'access', strip_tags($this->title)));
+            $strhide = addslashes_js(get_string('hideblocka', 'access', strip_tags($this->title)));
             $title .= '<input type="image" src="'.$CFG->pixpath.'/t/switch_minus.gif" '. 
                 'id="togglehide_inst'.$this->instance->id.'" '.
                 'onclick="elementToggleHide(this, true, function(el) {'.