natalie
/
srchub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing issue with filter

master
Nathan Adams 2014-03-09 23:10:52 -05:00
parent 700889bedd
commit cc6f03a62d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indefero/src/IDF/templates/idf/wiki/viewPage.html
View File

@ -27,9 +27,6 @@ by {$submitter}.{/blocktrans}</p>
<div id="wiki-toc"><span id="contentheader">{trans 'Table of Content'}</span><div id="wiki-toc-content"></div></div> <div id="wiki-toc"><span id="contentheader">{trans 'Table of Content'}</span><div id="wiki-toc-content"></div></div>
<script type="text/javascript" src="{media '/idf/js/wiki-toc.js'}"></script> <script type="text/javascript" src="{media '/idf/js/wiki-toc.js'}"></script>
<p class="desc">{$page.summary}</p> <p class="desc">{$page.summary}</p>
{literal}
<script type="syntaxhighlighter" class="brush: js"> for(i = 0; i < 10; i++) { } </script>
{/literal}
{markdown $rev.content, $request} {markdown $rev.content, $request}

13
pluf/src/Pluf/Text/HTML/Filter.php
View File

@ -125,6 +125,8 @@ class Pluf_Text_HTML_Filter
*/ */
public $allow_hexadecimal_entities = 1; public $allow_hexadecimal_entities = 1;
public $check_tags_flag = 0;
public $allowed_entities = array( public $allowed_entities = array(
'amp', 'amp',
'gt', 'gt',
@ -173,10 +175,13 @@ class Pluf_Text_HTML_Filter
function check_tags($data) function check_tags($data)
{ {
$data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))", $data); if ($this->check_tags_flag)
foreach (array_keys($this->tag_counts) as $tag) { {
for ($i=0; $i<$this->tag_counts[$tag]; $i++) { $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))", $data);
$data .= "</$tag>"; foreach (array_keys($this->tag_counts) as $tag) {
for ($i=0; $i<$this->tag_counts[$tag]; $i++) {
$data .= "</$tag>";
}
} }
} }
return $data; return $data;