Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle

This commit is contained in:
David Monllao 2017-05-22 15:13:58 +08:00
commit 13a1e8b50c

View File

@ -27,8 +27,6 @@ require_once($CFG->dirroot . '/mod/wiki/pagelib.php');
// 'create' action will create a new page in db, and redirect to
// page editing page.
$action = optional_param('action', 'new', PARAM_TEXT);
// The title of the new page, can be empty
$title = optional_param('title', get_string('newpage', 'wiki'), PARAM_TEXT);
$wid = optional_param('wid', 0, PARAM_INT);
$swid = optional_param('swid', 0, PARAM_INT);
$group = optional_param('group', 0, PARAM_INT);
@ -86,6 +84,8 @@ $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST)
require_login($course, true, $cm);
// The title of the new page, cannot be empty.
$title = optional_param('title', get_string('newpage', 'wiki'), PARAM_TEXT);
$wikipage = new page_wiki_create($wiki, $subwiki, $cm);
if (!empty($swid)) {