merge from 18 STABLE MDL-8809

diff --git a/question/type/datasetdependent/datasetitems_form.php b/question/type/datasetdependent/datasetitems_form.php
index 959a13b5da7ea1bfd5fd55a2b1b02d8211391407..bc48ae07ce07725c92afba794c553701cb54ebac 100644 (file)
--- a/question/type/datasetdependent/datasetitems_form.php
+++ b/question/type/datasetdependent/datasetitems_form.php
@@ -68,7 +68,7 @@ class question_dataset_dependent_items_form extends moodleform {
             $this->noofitems = 0;
         }
 //------------------------------------------------------------------------------------------------------------------------------
-        $mform->addElement('submit', 'updatedatasets', get_string('Update the datasets parameters', 'qtype_datasetdependent'));
+        $mform->addElement('submit', 'updatedatasets', get_string('updatedatasetparam', 'qtype_datasetdependent'));
         $mform->addElement('header', 'additemhdr', get_string('itemtoadd', 'qtype_datasetdependent'));
         $idx = 1;
         $j = (($this->noofitems) * count($this->datasetdefs))+1;
@@ -202,7 +202,7 @@ class question_dataset_dependent_items_form extends moodleform {
 
     function validation($data){
         $errors = array();
-        if (isset($data['backtoquiz']) && ($this->noofitems===0)){
+        if (isset($data['backtoquiz']) && ($this->noofitems==0)){
             $errors['addbutton'] = get_string('youmustaddatleastoneitem', 'qtype_datasetdependent');
         }
         return $errors;