MDL-33397 Filepicker: cancel button always present in private files

2012-05-29 15:18:05 +08:00
parent 5bb8e807eb
commit 03ba959758
2 changed files with 2 additions and 5 deletions
@@ -33,10 +33,8 @@ if (isguestuser()) {
 }

 $returnurl = optional_param('returnurl', '', PARAM_URL);
-$returnbutton = true;

 if (empty($returnurl)) {
-    $returnbutton = false;
    $returnurl = new moodle_url('/user/filesedit.php');
 }

@@ -58,7 +56,7 @@ $data->returnurl = $returnurl;
 $options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
 file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0);

-$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options, 'cancelbutton'=>$returnbutton));
+$mform = new user_filesedit_form(null, array('data'=>$data, 'options'=>$options));

 if ($mform->is_cancelled()) {
    redirect($returnurl);