mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-10 10:58:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-01-08 13:57:47 +08:00
commit d161e37488
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/managesubscriptions.php
View File

@ -78,7 +78,7 @@ if (!empty($formdata)) {
$importresults = calendar_update_subscription_events($subscriptionid);
}
// Redirect to prevent refresh issues.
redirect($PAGE->url);
redirect($PAGE->url, $importresults);
} else if (!empty($subscriptionid)) {
// The user is wanting to perform an action upon an existing subscription.
require_sesskey(); // Must have sesskey for all actions.

3
calendar/renderer.php
View File

@ -736,6 +736,7 @@ class core_calendar_renderer extends plugin_renderer_base {
$table->head = array(
get_string('colcalendar', 'calendar'),
get_string('collastupdated', 'calendar'),
get_string('eventkind', 'calendar'),
get_string('colpoll', 'calendar'),
get_string('colactions', 'calendar')
);
@ -762,10 +763,12 @@ class core_calendar_renderer extends plugin_renderer_base {
$cell = new html_table_cell($this->subscription_action_form($sub, $courseid));
$cell->colspan = 2;
$type = $sub->eventtype . 'events';
$table->data[] = new html_table_row(array(
new html_table_cell($label),
new html_table_cell($lastupdated),
new html_table_cell(get_string($type, 'calendar')),
$cell
));
}