Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:51:47 +0000 (00:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 22:51:47 +0000 (00:51 +0200)
Conflicts:
mod/glossary/mod_form.php

1  2 
lang/en/moodle.php
mod/glossary/mod_form.php

Simple merge
@@@ -86,9 -82,9 +82,10 @@@ class mod_glossary_mod_form extends moo
          $mform->setDefault('approvaldisplayformat', 'default');
          $mform->addHelpButton('approvaldisplayformat', 'approvaldisplayformat', 'glossary');
  
-         $mform->addElement('selectyesno', 'showspecial', get_string('showspecial', 'glossary'));
-         $mform->setDefault('showspecial', 1);
-         $mform->addHelpButton('showspecial', 'showspecial', 'glossary');
+         $mform->addElement('text', 'entbypage', get_string('entbypage', 'glossary'));
+         $mform->setDefault('entbypage', $this->get_default_entbypage());
+         $mform->addRule('entbypage', null, 'numeric', null, 'client');
++        $mform->setType('entbypage', PARAM_INT);
  
          $mform->addElement('selectyesno', 'showalphabet', get_string('showalphabet', 'glossary'));
          $mform->setDefault('showalphabet', 1);