Index: mod_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/mod_form.php,v
retrieving revision 1.20.2.3
diff -u -r1.20.2.3 mod_form.php
--- mod_form.php	26 Jul 2008 15:17:04 -0000	1.20.2.3
+++ mod_form.php	26 May 2009 22:25:50 -0000
@@ -54,10 +54,15 @@
         $mform->setDefault('allowprintview', 1);
         $mform->setHelpButton('allowprintview', array('allowprintview', get_string('allowprintview', 'glossary'), 'glossary'));
 
-        $mform->addElement('selectyesno', 'usedynalink', get_string('usedynalink', 'glossary'));
-        $mform->setDefault('usedynalink', $CFG->glossary_linkbydefault);
-        $mform->setHelpButton('usedynalink', array('usedynalink', get_string('usedynalink', 'glossary'), 'glossary'));
-
+        /* Check global site setting for "Automatically link glossary entries. If "No" then hide the option */
+        if ($CFG->glossary_linkbydefault) {
+           $mform->addElement('selectyesno', 'usedynalink', get_string('usedynalink', 'glossary'));
+           $mform->setDefault('usedynalink', $CFG->glossary_linkbydefault);
+           $mform->setHelpButton('usedynalink', array('usedynalink', get_string('usedynalink', 'glossary'), 'glossary'));
+        } else {
+           $mform->addElement('hidden', 'usedynalink', $usedynalink);
+           $mform->addElement('hidden', 'usedynalink', $usedynalink);
+        }
         $mform->addElement('selectyesno', 'defaultapproval', get_string('defaultapproval', 'glossary'));
         $mform->setDefault('defaultapproval', $CFG->glossary_defaultapproval);
         $mform->setHelpButton('defaultapproval', array('defaultapproval', get_string('defaultapproval', 'glossary'), 'glossary'));