L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle

Browse Source 
- resolved conflict.
This commit is contained in:
Aparup Banerjee
2011-09-13 13:52:31 +08:00
parent f7dd6bda31 63390481c4
commit 7eae2c5ae2
11 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/delete.php
+2 -1
View File
@@ -31,10 +31,11 @@
$category = $DB->get_record("course_categories", array("id"=>$course->category));
$courseshortname = format_string($course->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
$categoryname = format_string($category->name, true, array('context' => get_context_instance(CONTEXT_COURSECAT, $category->id)));
$PAGE->navbar->add($stradministration, new moodle_url('/admin/index.php/'));
$PAGE->navbar->add($strcategories, new moodle_url('/course/index.php'));
$PAGE->navbar->add($category->name, new moodle_url('/course/category.php', array('id'=>$course->category)));
$PAGE->navbar->add($categoryname, new moodle_url('/course/category.php', array('id'=>$course->category)));
if (! $delete) {
$strdeletecheck = get_string("deletecheck", "", $courseshortname);
$strdeletecoursecheck = get_string("deletecoursecheck");