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

Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2011-10-04 16:21:16 +13:00
parent 66d216c574 1323bf5597
commit 2bbe5979cb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/lang/en/wiki.php
+1
View File
@@ -93,6 +93,7 @@ $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.';
$string['invalidlock'] = 'This page is already locked by another user.';
$string['invalidparameters'] = 'Invalid parameters have been given.';
$string['invalidsection'] = 'Invalid section.';
$string['invalidsesskey'] = 'The given sesskey is not valid. Please resend data again';
$string['individualpagedoesnotexist'] = 'Individual wiki page doesn\'t exist';
$string['javascriptdisabledlocks'] = 'Javascript is disabled on your browser and locks are not working. The changes you make may not be saved correctly.';
mod/wiki/pagelib.php
+6 -6
View File
@@ -477,7 +477,7 @@ class page_wiki_edit extends page_wiki {
$params = 'pageid=' . $this->page->id;
if ($this->section) {
$params .= '&section=' . $this->section;
$params .= '&section=' . urlencode($this->section);
}
$form = '<form method="post" action="' . $CFG->wwwroot . '/mod/wiki/overridelocks.php?' . $params . '">';
@@ -523,7 +523,7 @@ class page_wiki_edit extends page_wiki {
$url = $CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $this->page->id;
if (!empty($this->section)) {
$url .= "&section=" . $this->section;
$url .= "&section=" . urlencode($this->section);
}
$params = array('attachmentoptions' => page_wiki_edit::$attachmentoptions, 'format' => $version->contentformat, 'version' => $versionnumber, 'pagetitle'=>$this->page->title);
@@ -990,7 +990,7 @@ class page_wiki_preview extends page_wiki_edit {
$url = $CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $this->page->id;
if (!empty($this->section)) {
$url .= "&section=" . $this->section;
$url .= "&section=" . urlencode($this->section);
}
$params = array('attachmentoptions' => page_wiki_edit::$attachmentoptions, 'format' => $this->format, 'version' => $this->versionnumber);
@@ -1980,7 +1980,7 @@ class page_wiki_save extends page_wiki_edit {
$url = $CFG->wwwroot . '/mod/wiki/edit.php?pageid=' . $this->page->id;
if (!empty($this->section)) {
$url .= "&section=" . $this->section;
$url .= "&section=" . urlencode($this->section);
}
$params = array('attachmentoptions' => page_wiki_edit::$attachmentoptions, 'format' => $this->format, 'version' => $this->versionnumber);
@@ -2305,7 +2305,7 @@ class page_wiki_overridelocks extends page_wiki_edit {
$args = "pageid=" . $this->page->id;
if (!empty($this->section)) {
$args .= "&section=" . $this->section;
$args .= "&section=" . urlencode($this->section);
}
redirect($CFG->wwwroot . '/mod/wiki/edit.php?' . $args, get_string('overridinglocks', 'wiki'), 2);
@@ -2334,7 +2334,7 @@ class page_wiki_overridelocks extends page_wiki_edit {
$args = "pageid=" . $this->page->id;
if (!empty($this->section)) {
$args .= "&section=" . $this->section;
$args .= "&section=" . urlencode($this->section);
}
redirect($CFG->wwwroot . '/mod/wiki/edit.php?' . $args, get_string('overridinglocks', 'wiki'), 2);