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

Merge branch MDL-29186-m21 of git://github.com/samhemelryk/moodle

Browse Source 
- resolved conflicts, minor whitespace and fixed quote.
    - note: textlib_get_instance() is already deprecated
This commit is contained in:
Aparup Banerjee
2011-09-13 16:19:47 +08:00
parent 6519a7769d 0347dd4d70
commit d8f2500f46
31 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
notes/index.php
+5 -2
View File
@@ -111,8 +111,9 @@ if ($courseid != SITEID) {
$context = get_context_instance(CONTEXT_COURSE, $courseid);
$addid = has_capability('moodle/notes:manage', $context) ? $courseid : 0;
$view = has_capability('moodle/notes:view', $context);
$fullname = format_string($course->fullname, true, array('context' => $context));
note_print_notes('<a name="sitenotes"></a>' . $strsitenotes, $addid, $view, 0, $userid, NOTES_STATE_SITE, 0);
note_print_notes('<a name="coursenotes"></a>' . $strcoursenotes. ' ('.$course->fullname.')', $addid, $view, $courseid, $userid, NOTES_STATE_PUBLIC, 0);
note_print_notes('<a name="coursenotes"></a>' . $strcoursenotes. ' ('.$fullname.')', $addid, $view, $courseid, $userid, NOTES_STATE_PUBLIC, 0);
note_print_notes('<a name="personalnotes"></a>' . $strpersonalnotes, $addid, $view, $courseid, $userid, NOTES_STATE_DRAFT, $USER->id);
} else { // Normal course
@@ -124,7 +125,9 @@ if ($courseid != SITEID) {
if (!empty($userid)) {
$courses = enrol_get_users_courses($userid);
foreach($courses as $c) {
$header = '<a href="' . $CFG->wwwroot . '/course/view.php?id=' . $c->id . '">' . $c->fullname . '</a>';
$ccontext = get_context_instance(CONTEXT_COURSE, $c->id);
$cfullname = format_string($c->fullname, true, array('context' => $ccontext));
$header = '<a href="' . $CFG->wwwroot . '/course/view.php?id=' . $c->id . '">' . $cfullname . '</a>';
if (has_capability('moodle/notes:manage', get_context_instance(CONTEXT_COURSE, $c->id))) {
$addid = $c->id;
} else {