MDL-14635 remove tags from glossary block help, merged from 19

diff --git a/blocks/glossary_random/config_instance.html b/blocks/glossary_random/config_instance.html
index 5b5d2ea07714f93ddb7458190d0b3b07bf64576e..081b14ec797538483c148789e0ca7d648a423a8f 100644 (file)
--- a/blocks/glossary_random/config_instance.html
+++ b/blocks/glossary_random/config_instance.html
@@ -26,8 +26,7 @@
 <td align="right"><?php print_string("type","block_glossary_random") ?>:</td>
 <td><?php
      choose_from_menu($type, "type", $this->config->type, "");
-     helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
-     // helpbutton("type_help", get_string("type_help", "block_glossary_random"), "block/glossary_random");
+     helpbutton('newentry', get_string("type","block_glossary_random"), 'glossary');
      ?></td>
 </tr> 
 

diff --git a/lang/en_utf8/block_glossary_random.php b/lang/en_utf8/block_glossary_random.php
index 3f4a8ba62e60452b78eb2a166d3bae8f2b3e8ad6..f9878b5180ffef190d1f3d8443fb1ec53a2e8c77 100644 (file)
--- a/lang/en_utf8/block_glossary_random.php
+++ b/lang/en_utf8/block_glossary_random.php
@@ -20,7 +20,6 @@ $string['select_glossary'] = 'Take entries from this glossary';
 $string['showconcept'] = 'Show concept (heading) for each entry';
 $string['title'] = 'Title';
 $string['type'] = 'How a new entry is chosen';
-$string['typehelp'] = '<b>Last modified entry</b> will always display the entry that was last modified, and <b>Random entry</b> will choose a new one at random every time.  The option <b>Next entry</b> will cycle through the entries in order.  This last option is especially useful when a number of days is also chosen, allowing you to make a <i>Quote of the week</i> or a <i>Tip of the day</i> that everyone sees.';
 $string['viewglossary'] = 'More quotes...';
 $string['whichfooter'] = 'You can display links to actions of the glossary this block is associated with. The block will only display links to actions which are enabled for that glossary.';
 

diff --git a/lang/en_utf8/help/glossary/newentry.html b/lang/en_utf8/help/glossary/newentry.html
new file mode 100644 (file)
index 0000000..9f323de
--- /dev/null
+++ b/lang/en_utf8/help/glossary/newentry.html
@@ -0,0 +1,5 @@
+<b>Last modified entry</b> will always display the entry that was last modified, 
+and <b>Random entry</b> will choose a new one at random every time.  The option 
+<b>Next entry</b> will cycle through the entries in order.  This last option is 
+especially useful when a number of days is also chosen, allowing you to make a 
+<i>Quote of the week</i> or a <i>Tip of the day</i> that everyone sees.

diff --git a/lib/weblib.php b/lib/weblib.php
index b23256ddd832b1f15e9a7cc6776203c45a6e0c34..fafb8e07d5a11332e51a069c81d2bdb04913210e 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -5873,6 +5873,13 @@ function helpbutton ($page, $title, $module='moodle', $image=true, $linktext=fal
                      $imagetext='') {
     global $CFG, $COURSE;
 
+      //warning if ever $text parameter is used
+    //$text option won't work properly because the text needs to be always cleaned and,
+    // when cleaned... html tags always break, so it's unusable.
+    if ( isset($text) && $text!='') {
+      debugging('Warning: it\'s not recommended to use $text parameter in helpbutton ($page=' . $page . ', $module=' . $module . ') function');
+    }
+    
     // fix for MDL-7734
     if (!empty($COURSE->lang)) {
         $forcelang = $COURSE->lang;