Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle

sehaj-sk · May 31, 2012 · 9c6e153 · 9c6e153
2 parents 1adb060 + a960dfa
commit 9c6e153
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/user/files.php b/user/files.php
@@ -33,10 +33,8 @@
 }
 
 $returnurl = optional_param('returnurl', '', PARAM_URL);
-$returnbutton = true;
 
 if (empty($returnurl)) {
-    $returnbutton = false;
     $returnurl = new moodle_url('/user/files.php');
 }
 
@@ -58,7 +56,7 @@
 $options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*');
 file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0);
 
-$mform = new user_files_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton));
+$mform = new user_files_form(null, array('data'=>$data, 'options'=>$options));
 
 if ($mform->is_cancelled()) {
     redirect($returnurl);

diff --git a/user/files_form.php b/user/files_form.php
@@ -33,12 +33,11 @@ function definition() {
 
         $data           = $this->_customdata['data'];
         $options        = $this->_customdata['options'];
-        $cancelbutton   = isset($this->_customdata['cancelbutton']) ? $this->_customdata['cancelbutton'] : true;
 
         $mform->addElement('filemanager', 'files_filemanager', get_string('files'), null, $options);
         $mform->addElement('hidden', 'returnurl', $data->returnurl);
 
-        $this->add_action_buttons($cancelbutton, get_string('savechanges'));
+        $this->add_action_buttons(true, get_string('savechanges'));
 
         $this->set_data($data);
     }