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

Merge branch 'MDL-48307-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-03-22 00:13:00 +01:00
parent d0f1a93260 aa7c4bed07
commit 06ecd3de42
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/parser/markups/html.php
+7 -5
View File
@@ -110,18 +110,20 @@ class html_parser extends nwiki_parser {
* @return string
*/
protected function generate_header($text, $level) {
$text = trim($text);
$toctext = $text = trim($text);
$normlevel = $level - $this->minheaderlevel + 1;
if (!$this->pretty_print && $normlevel == 1) {
$text .= ' ' . parser_utils::h('a', '['.get_string('editsection', 'wiki').']',
array('href' => "edit.php?pageid={$this->wiki_page_id}&section=" . urlencode($text),
'class' => 'wiki_edit_section'));
$editlink = '[' . get_string('editsection', 'wiki') . ']';
$url = array('href' => "edit.php?pageid={$this->wiki_page_id}&section=" . urlencode($text),
'class' => 'wiki_edit_section');
$text .= ' ' . parser_utils::h('a', $this->protect($editlink), $url);
$toctext .= ' ' . parser_utils::h('a', $editlink, $url);
}
if ($normlevel <= $this->maxheaderdepth) {
$this->toc[] = array($normlevel, $text);
$this->toc[] = array($normlevel, $toctext);
$num = count($this->toc);
$text = parser_utils::h('a', "", array('name' => "toc-$num")) . $text;
}
mod/wiki/parser/markups/wikimarkup.php
+7 -5
View File
@@ -178,16 +178,18 @@ abstract class wiki_markup_parser extends generic_parser {
*/
protected function generate_header($text, $level) {
$text = trim($text);
$toctext = $text = trim($text);
if (!$this->pretty_print && $level == 1) {
$text .= ' ' . parser_utils::h('a', '['.get_string('editsection', 'wiki').']',
array('href' => "edit.php?pageid={$this->wiki_page_id}&section=" . urlencode($text),
'class' => 'wiki_edit_section'));
$editlink = '[' . get_string('editsection', 'wiki') . ']';
$url = array('href' => "edit.php?pageid={$this->wiki_page_id}&section=" . urlencode($text),
'class' => 'wiki_edit_section');
$text .= ' ' . parser_utils::h('a', $this->protect($editlink), $url);
$toctext .= ' ' . parser_utils::h('a', $editlink, $url);
}
if ($level <= $this->maxheaderdepth) {
$this->toc[] = array($level, $text);
$this->toc[] = array($level, $toctext);
$num = count($this->toc);
$text = parser_utils::h('a', "", array('name' => "toc-$num")) . $text;
}