Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'wip-MDL-27064-stable21' of git://github.com/phalacee/mo…

…odle into MOODLE_21_STABLE
  • Loading branch information...
commit 9ac6d34dbd2d451338c29cfd18f3a46cbb9f9fb8 2 parents 0f08848 + 9a47738
Sam Hemelryk samhemelryk authored
Showing with 4 additions and 2 deletions.
  1. +2 −0  lang/en/blog.php
  2. +2 −2 lib/navigationlib.php
2  lang/en/blog.php
View
@@ -54,6 +54,8 @@
$string['blogentrybyuser'] = 'Blog entry by {$a}';
$string['blogpreferences'] = 'Blog preferences';
$string['blogs'] = 'Blogs';
+$string['blogscourse'] = 'Course blogs';
+$string['blogssite'] = 'Site blogs';
$string['blogtags'] = 'Blog tags';
$string['cannotviewcourseblog'] = 'You do not have the required permissions to view blogs in this course';
$string['cannotviewcourseorgroupblog'] = 'You do not have the required permissions to view blogs in this course/group';
4 lib/navigationlib.php
View
@@ -2301,7 +2301,7 @@ public function add_course_essentials($coursenode, stdClass $course) {
if (($CFG->bloglevel == BLOG_GLOBAL_LEVEL or ($CFG->bloglevel == BLOG_SITE_LEVEL and (isloggedin() and !isguestuser())))
and has_capability('moodle/blog:view', get_context_instance(CONTEXT_SYSTEM))) {
$blogsurls = new moodle_url('/blog/index.php', array('courseid' => $filterselect));
- $participants->add(get_string('blogs','blog'), $blogsurls->out());
+ $participants->add(get_string('blogscourse','blog'), $blogsurls->out());
}
if (!empty($CFG->enablenotes) && (has_capability('moodle/notes:manage', $this->page->context) || has_capability('moodle/notes:view', $this->page->context))) {
$participants->add(get_string('notes','notes'), new moodle_url('/notes/index.php', array('filtertype'=>'course', 'filterselect'=>$course->id)));
@@ -2361,7 +2361,7 @@ public function add_front_page_course_essentials(navigation_node $coursenode, st
and ($CFG->bloglevel == BLOG_GLOBAL_LEVEL or ($CFG->bloglevel == BLOG_SITE_LEVEL and (isloggedin() and !isguestuser())))
and has_capability('moodle/blog:view', get_context_instance(CONTEXT_SYSTEM))) {
$blogsurls = new moodle_url('/blog/index.php', array('courseid' => $filterselect));
- $coursenode->add(get_string('blogs','blog'), $blogsurls->out());
+ $coursenode->add(get_string('blogssite','blog'), $blogsurls->out());
}
// Notes
Please sign in to comment.
Something went wrong with that request. Please try again.