Merged blog theme/lang fixes from MDL-10833

diff --git a/blog/edit.php b/blog/edit.php
index 1e17482f2c181c4748151625362d77eeadd91517..4927036c9ea4f495f9b422c6aaf763f4aa300598 100755 (executable)
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -9,7 +9,7 @@ $id       = optional_param('id', 0, PARAM_INT);
 $confirm  = optional_param('confirm', 0, PARAM_BOOL);
 $courseid = optional_param('courseid', 0, PARAM_INT); // needed for user tab - does nothing here
 
-require_login();
+require_login($courseid);
 
 if (empty($CFG->bloglevel)) {
     error('Blogging is disabled!');

diff --git a/blog/index.php b/blog/index.php
index 2e977f4717b905ceffbd00ca33d4a27ebf09f124..f472923abc2da1931a0573e8731d85ff37390b18 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -74,7 +74,7 @@ switch ($filtertype) {
         }
         $courseid = $course->id;
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        require_login($course->id);
+        require_login($course);
         if (!has_capability('moodle/blog:view', $coursecontext)) {
             error('You do not have the required permissions to view blogs in this course');
         }
@@ -94,7 +94,7 @@ switch ($filtertype) {
         }
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $courseid = $course->id;
-        require_login($course->id);
+        require_login($course);
         if (!has_capability('moodle/blog:view', $coursecontext)) {
             error('You do not have the required permissions to view blogs in this course/group');
         }
@@ -131,6 +131,10 @@ switch ($filtertype) {
         }
         $userid = $filterselect;
 
+        if (!empty($courseid)) {
+            require_login($courseid);
+        }
+
     break;
 
     default: