Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-31708-moodle22' of git://github.com/StudiUM/moodle …

…into MOODLE_22_STABLE
  • Loading branch information...
commit a70978a2bd639bfe8b61cf4f1a688954fc41c7b1 2 parents 61f0581 + d0d121a
@nebgor nebgor authored
View
2  mod/wiki/lang/en/wiki.php
@@ -22,8 +22,10 @@
$string['backpage'] = 'Back to page';
$string['backtomapmenu'] = 'Back to map menu';
$string['changerate'] = 'Do you wish to change it?';
+$string['cannoteditpage'] = 'You can not edit this page.';
$string['cannotmanagefiles'] = 'You don\'t have permission to manage the wiki files.';
$string['cannotviewfiles'] = 'You don\'t have permission to view the wiki files.';
+$string['cannotviewpage'] = 'You can not view this page.';
$string['comparesel'] = 'Compare selected';
$string['comments'] = 'Comments';
$string['commentscount'] = 'Comments ({$a})';
View
2  mod/wiki/lib.php
@@ -536,7 +536,7 @@ function wiki_extend_navigation(navigation_node $navref, $course, $module, $cm)
$node = $navref->add(get_string('view', 'wiki'), $link, navigation_node::TYPE_SETTING);
}
- if (has_capability('mod/wiki:editpage', $context)) {
+ if (wiki_user_can_edit($subwiki)) {
$link = new moodle_url('/mod/wiki/edit.php', array('pageid' => $pageid));
$node = $navref->add(get_string('edit', 'wiki'), $link, navigation_node::TYPE_SETTING);
}
View
2  mod/wiki/locallib.php
@@ -766,7 +766,7 @@ function wiki_user_can_view($subwiki) {
// Each person owns a wiki.
if ($wiki->wikimode == 'collaborative' || $wiki->wikimode == 'individual') {
// Only members of subwiki group could view that wiki
- if ($subwiki->groupid == groups_get_activity_group($cm)) {
+ if (groups_is_member($subwiki->groupid)) {
// Only view capability needed
return has_capability('mod/wiki:viewpage', $context);
View
11 mod/wiki/pagelib.php
@@ -172,13 +172,8 @@ protected function setup_tabs($options = array()) {
if (!$manage and !($edit and groups_is_member($currentgroup))) {
unset($this->tabs['edit']);
}
- } else {
- if (!has_capability('mod/wiki:editpage', $PAGE->context)) {
- unset($this->tabs['edit']);
- }
}
-
if (empty($options)) {
$this->tabs_options = array('activetab' => substr(get_class($this), 10));
} else {
@@ -326,8 +321,7 @@ function print_content() {
}
}
} else {
- // @TODO: Tranlate it
- echo "You can not view this page";
+ echo get_string('cannotviewpage', 'wiki');
}
}
@@ -420,8 +414,7 @@ function print_content() {
if (wiki_user_can_edit($this->subwiki)) {
$this->print_edit();
} else {
- // @TODO: Translate it
- echo "You can not edit this page";
+ echo get_string('cannoteditpage', 'wiki');
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.