Permalink
Browse files

Merge branch 'wip-MDL-27334-master' of git://github.com/abgreeve/moodle

  • Loading branch information...
2 parents b50ac85 + b489d37 commit d423462e1cdfd5be9e586b9e93510aa4af6d8ce9 @nebgor nebgor committed Nov 30, 2011
Showing with 4 additions and 2 deletions.
  1. +4 −2 mod/forum/index.php
View
@@ -68,7 +68,6 @@
$stryes = get_string('yes');
$strno = get_string('no');
$strrss = get_string('rss');
-$strsectionname = get_string('sectionname', 'format_'.$course->format);
$searchform = forum_search_form($course);
@@ -300,6 +299,9 @@
/// Now let's process the learning forums
if ($course->id != SITEID) { // Only real courses have learning forums
+ // This is only required for use here and there needs to be a check to see if
+ // course id is the same as the site id. Moved from above. MDL-27334
+ $strsectionname = get_string('sectionname', 'format_'.$course->format);
// Add extra field for section number, at the front
array_unshift($learningtable->head, $strsectionname);
array_unshift($learningtable->align, 'center');
@@ -410,7 +412,7 @@
$PAGE->set_button($searchform);
echo $OUTPUT->header();
-if (!isguestuser()) {
+if (!isguestuser() && isloggedin()) {
echo $OUTPUT->box_start('subscription');
echo html_writer::tag('div',
html_writer::link(new moodle_url('/mod/forum/index.php', array('id'=>$course->id, 'subscribe'=>1, 'sesskey'=>sesskey())),

0 comments on commit d423462

Please sign in to comment.