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

MDL-23636, fixed text when deleting or editing wiki comments

Browse Source
This commit is contained in:
Dongsheng Cai
2010-11-10 09:24:57 +00:00
parent e0f0c304fc
commit d6887efca0
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/lang/en/wiki.php
+2
View File
@@ -48,6 +48,8 @@ $string['diff_help'] = 'Selected versions of the page may be compared in order t
$string['edit'] = 'Edit';
$string['editcomment'] = 'Edit comment';
$string['editblocks'] = 'Turn edit blocks on';
$string['editingcomment'] = 'Editing comment';
$string['editblocks'] = 'Turn edit blocks on';
$string['filenotuploadederror'] = 'File \'{$a}\' could not be uploaded correctly.';
$string['filtername'] = 'Wiki Auto-linking';
$string['firstpagetitle'] = 'First page name';
mod/wiki/pagelib.php
+5 -5
View File
@@ -2168,7 +2168,7 @@ class page_wiki_handlecomments extends page_wiki {
}
public function print_content() {
global $PAGE, $USER;
global $CFG, $PAGE, $USER;
$context = get_context_instance(CONTEXT_MODULE, $PAGE->cm->id);
@@ -2179,16 +2179,17 @@ class page_wiki_handlecomments extends page_wiki {
} else if ($this->action == 'edit') {
$comment = wiki_get_comment($this->commentid);
$edit = has_capability('mod/wiki:editcomment', $context);
$owner = $comment->userid == $USER->id;
$owner = ($comment->userid == $USER->id);
if ($owner && $edit) {
$this->add_comment($this->content, $this->commentid);
}
} else if ($this->action == 'delete') {
$comment = wiki_get_comment($this->commentid);
$manage = has_capability('mod/wiki:managecomment', $context);
$owner = $comment->userid == $USER->id;
$owner = ($comment->userid == $USER->id);
if ($owner || $manage) {
$this->delete_comment($this->commentid);
redirect($CFG->wwwroot . '/mod/wiki/comments.php?pageid=' . $this->page->id, get_string('deletecomment', 'wiki'), 2);
}
}
@@ -2224,6 +2225,7 @@ class page_wiki_handlecomments extends page_wiki {
redirect($CFG->wwwroot . '/mod/wiki/comments.php?pageid=' . $pageid, get_string('createcomment', 'wiki'), 2);
} else {
$this->delete_comment($idcomment);
redirect($CFG->wwwroot . '/mod/wiki/comments.php?pageid=' . $pageid, get_string('editingcomment', 'wiki'), 2);
}
}
@@ -2235,8 +2237,6 @@ class page_wiki_handlecomments extends page_wiki {
$pageid = $this->page->id;
wiki_delete_comment($commentid, $context, $pageid);
redirect($CFG->wwwroot . '/mod/wiki/comments.php?pageid=' . $pageid, get_string('deletecomment', 'wiki'), 2);
}
}