From 03ba9597584df6ebbeae7ba770fa575f044b1812 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Tue, 29 May 2012 15:18:05 +0800
Subject: [PATCH] MDL-33397 Filepicker: cancel button always present in private
 files

---
 user/filesedit.php      | 4 +---
 user/filesedit_form.php | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/user/filesedit.php b/user/filesedit.php
index 2438f73002e..afc4d16a48d 100644
--- a/user/filesedit.php
+++ b/user/filesedit.php
@@ -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);
diff --git a/user/filesedit_form.php b/user/filesedit_form.php
index 13cc0418c3e..f0a7ccfd97c 100644
--- a/user/filesedit_form.php
+++ b/user/filesedit_form.php
@@ -33,12 +33,11 @@ class user_filesedit_form extends moodleform {
 
         $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);
     }