# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: moodle/blocks/glossary_random/config_instance.html --- moodle/blocks/glossary_random/config_instance.html Base (1.9) +++ moodle/blocks/glossary_random/config_instance.html Locally Modified (Based On 1.9) @@ -26,8 +26,7 @@ : 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"), 'block_glossary_random'); ?> Index: moodle/lang/en_utf8/block_glossary_random.php --- moodle/lang/en_utf8/block_glossary_random.php Base (1.2) +++ moodle/lang/en_utf8/block_glossary_random.php Locally Modified (Based On 1.2) @@ -20,7 +20,6 @@ $string['showconcept'] = 'Show concept (heading) for each entry'; $string['title'] = 'Title'; $string['type'] = 'How a new entry is chosen'; -$string['typehelp'] = 'Last modified entry will always display the entry that was last modified, and Random entry will choose a new one at random every time. The option Next entry 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 Quote of the week or a Tip of the day 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.'; Index: moodle/lang/en_utf8/help/block_glossary_random/newentry.html --- moodle/lang/en_utf8/help/block_glossary_random/newentry.html No Base Revision +++ moodle/lang/en_utf8/help/block_glossary_random/newentry.html Locally New @@ -0,0 +1,5 @@ +Last modified entry will always display the entry that was last modified, +and Random entry will choose a new one at random every time. The option +Next entry 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 +Quote of the week or a Tip of the day that everyone sees. Index: moodle/lib/weblib.php --- moodle/lib/weblib.php Base (1.970.2.90) +++ moodle/lib/weblib.php Locally Modified (Based On 1.970.2.90) @@ -5836,6 +5836,12 @@ $imagetext='') { global $CFG, $COURSE; + //warning if ever + 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;