Commit ff658615 authored by David Monllaó's avatar David Monllaó Committed by Dan Poltawski
Browse files

Merge branch 'MDL-51935-28' of git://github.com/dpalou/moodle into MOODLE_28_STABLE

parents 7920d1f0 5d2e3c1b
......@@ -46,20 +46,20 @@ if (!empty($swid)) {
$subwiki = wiki_get_subwiki($swid);
if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
print_error('invalidwikiid', 'wiki');
print_error('incorrectwikiid', 'wiki');
}
} else {
$subwiki = wiki_get_subwiki_by_group($wid, $group, $uid);
if (!$wiki = wiki_get_wiki($wid)) {
print_error('invalidwikiid', 'wiki');
print_error('incorrectwikiid', 'wiki');
}
}
if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
print_error('invalidcoursemoduleid', 'wiki');
print_error('invalidcoursemodule');
}
$groups = new stdClass();
......
......@@ -63,7 +63,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
$course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
if ($compare >= $comparewith) {
print_error("A page version can only be compared with an older version.");
print_error('cannotcomparenewerversion', 'wiki');
}
require_login($course, true, $cm);
......
......@@ -22,6 +22,7 @@ $string['backoldversion'] = 'Back to old version';
$string['backpage'] = 'Back to page';
$string['backtomapmenu'] = 'Back to map menu';
$string['changerate'] = 'Do you wish to change it?';
$string['cannotcomparenewerversion'] = 'A page version can only be compared with an older version.';
$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.';
......@@ -102,6 +103,9 @@ $string['history'] = 'History';
$string['history_help'] = 'The history lists links to previous versions of the page.';
$string['html'] = 'HTML';
$string['incorrectdeleteversions'] = "Page versions provided for deletion are incorrect.";
$string['incorrectpageid'] = 'Page ID is incorrect.';
$string['incorrectsubwikiid'] = 'Subwiki ID is incorrect.';
$string['incorrectwikiid'] = 'Wiki ID is incorrect.';
$string['insertcomment'] = 'Insert comment';
$string['insertimage'] = 'Insert an image...';
$string['insertimage_help'] = 'This drop-down list will insert an image to the wiki editor. If you need to add more images to the wiki, please use "Files" tab.';
......
......@@ -268,7 +268,7 @@ if ($id) {
// * Error. No more options
// */
} else {
print_error('incorrectparameters');
print_error('invalidparameters', 'wiki');
}
if (!wiki_user_can_view($subwiki, $wiki)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment