L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-32699-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-03-12 00:19:31 +01:00
parent f3e25119ad 200cf9a5be
commit f755c4a849
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/pagelib.php
+10 -6
View File
@@ -1836,11 +1836,15 @@ class page_wiki_restoreversion extends page_wiki {
}
function print_content() {
global $CFG, $PAGE;
global $PAGE;
require_capability('mod/wiki:managewiki', $this->modcontext, NULL, true, 'nomanagewikipermission', 'wiki');
$wiki = $PAGE->activityrecord;
if (wiki_user_can_edit($this->subwiki, $wiki)) {
$this->print_restoreversion();
} else {
echo get_string('cannoteditpage', 'wiki');
}
$this->print_restoreversion();
}
function set_url() {
@@ -2152,10 +2156,10 @@ class page_wiki_confirmrestore extends page_wiki_save {
function print_content() {
global $CFG, $PAGE;
require_capability('mod/wiki:managewiki', $this->modcontext, NULL, true, 'nomanagewikipermission', 'wiki');
$version = wiki_get_version($this->version->id);
if (wiki_restore_page($this->page, $version->content, $version->userid)) {
$wiki = $PAGE->activityrecord;
if (wiki_user_can_edit($this->subwiki, $wiki) &&
wiki_restore_page($this->page, $version->content, $version->userid)) {
redirect($CFG->wwwroot . '/mod/wiki/view.php?pageid=' . $this->page->id, get_string('restoring', 'wiki', $version->version), 3);
} else {
print_error('restoreerror', 'wiki', $version->version);