Merge branch 'MDL-36713_m32v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)
blog/edit.php
blog/index.php
blog/preferences.php

index 36a544c..bf9a166 100644 (file)
@@ -79,7 +79,7 @@ if (empty($CFG->enableblogs)) {
 }
 
 if (isguestuser()) {
-    print_error('noguestentry', 'blog');
+    print_error('noguest');
 }
 
 $returnurl = new moodle_url('/blog/index.php');
index fb1ef89..e639df3 100644 (file)
@@ -92,7 +92,7 @@ if ($CFG->bloglevel == BLOG_GLOBAL_LEVEL) {
     require_login();
     if (isguestuser()) {
         // They must have entered the url manually.
-        print_error('blogdisable', 'blog');
+        print_error('noguest');
     }
 
 } else if ($CFG->bloglevel == BLOG_USER_LEVEL) {
index 9c42bec..1871161 100644 (file)
@@ -63,6 +63,10 @@ if (empty($CFG->enableblogs)) {
     print_error('blogdisable', 'blog');
 }
 
+if (isguestuser()) {
+    print_error('noguest');
+}
+
 // The preference is site wide not blog specific. Hence user should have permissions in site level.
 require_capability('moodle/blog:view', $sitecontext);