Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle

This commit is contained in:
Petr Skoda 2011-01-03 18:02:44 +01:00
commit e1ce9a6670
2 changed files with 6 additions and 3 deletions

View file

@ -101,7 +101,7 @@ if (empty($pending)) {
$table = new html_table();
$table->attributes['class'] = 'pendingcourserequests generaltable';
$table->align = array('center', 'center', 'center', 'center', 'center', 'center', 'center');
$table->head = array(' ', get_string('shortname'), get_string('fullname'),
$table->head = array(get_string('shortname'), get_string('fullname'),
get_string('requestedby'), get_string('summary'), get_string('requestreason'), get_string('action'));
foreach ($pending as $course) {

View file

@ -32,6 +32,7 @@ $PAGE->set_url('/course/request.php');
/// Where we came from. Used in a number of redirects.
$returnurl = $CFG->wwwroot . '/course/index.php';
/// Check permissions.
require_login();
if (isguestuser()) {
@ -40,7 +41,9 @@ if (isguestuser()) {
if (empty($CFG->enablecourserequests)) {
print_error('courserequestdisabled', '', $returnurl);
}
require_capability('moodle/course:request', get_context_instance(CONTEXT_SYSTEM));
$context = get_context_instance(CONTEXT_SYSTEM);
$PAGE->set_context($context);
require_capability('moodle/course:request', $context);
/// Set up the form.
$data = course_request::prepare();