Merge branch 'MDL-33681_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2012-06-13 00:06:41 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -69,7 +69,7 @@ function callback_topics_request_key() {
function callback_topics_get_section_name($course, $section) {
// We can't add a node without any text
if (!empty($section->name)) {
if ((string)$section->name !== '') {
return format_string($section->name, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
} else if ($section->section == 0) {
return get_string('section0name', 'format_topics');
@@ -100,4 +100,4 @@ function callback_topics_ajax_support() {
*/
function callback_topics_get_section_url($courseid, $sectionnum) {
return new moodle_url('/course/view.php', array('id' => $courseid, 'topic' => $sectionnum));
}
}
+1 -1
View File
@@ -76,7 +76,7 @@ function callback_weeks_request_key() {
*/
function callback_weeks_get_section_name($course, $section) {
// We can't add a node without text
if (!empty($section->name)) {
if ((string)$section->name !== '') {
// Return the name the user set
return format_string($section->name, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
} else if ($section->section == 0) {