srchub-old Commit Details

Date:

2014-03-09 23:10:00 (10 years 7 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

25fed767e5df

Parents:

2edaca00bc79

Message:

Fixing issue with filter

Changes:

M	indefero/src/IDF/templates/idf/wiki/viewPage.html (1 diff)
M	pluf/src/Pluf/Text/HTML/Filter.php (2 diffs)

File differences

-27
28 28
29 29
30 
31 
32 
33 30
34 31
35 32
+<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>␊
<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}␊
␊
 <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>␊
 <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}␊
 ␊

-125
126 126
127 127
128
129
128 130
129 131
130 132
... ...
173 175
174 176
175 177
176 
177 
178 
179 
178
179
180
181
182
183
184
180 185
181 186
182 187
+     */␊
    public $allow_hexadecimal_entities = 1;␊
␊
    public $check_tags_flag = 0;␊
␊
    public $allowed_entities = array(␊
                                     'amp',␊
                                     'gt',␊

␊
    function check_tags($data)␊
    {␊
        $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))",␉$data);␊
        foreach (array_keys($this->tag_counts) as $tag) {␊
            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {␊
                $data .= "</$tag>";␊
        if ($this->check_tags_flag)␊
        {␊
            $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))",␉$data);␊
            foreach (array_keys($this->tag_counts) as $tag) {␊
                for ($i=0; $i<$this->tag_counts[$tag]; $i++) {␊
                    $data .= "</$tag>";␊
                }␊
            }␊
        }␊
        return $data;␊
 ...
      */␊
     public $allow_hexadecimal_entities = 1;␊
 ␊
+    public $check_tags_flag = 0;␊
+␊
     public $allowed_entities = array(␊
                                      'amp',␊
                                      'gt',␊
 ␊
     function check_tags($data)␊
     {␊
-        $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))",␉$data);␊
-        foreach (array_keys($this->tag_counts) as $tag) {␊
-            for ($i=0; $i<$this->tag_counts[$tag]; $i++) {␊
-                $data .= "</$tag>";␊
+        if ($this->check_tags_flag)␊
+        {␊
+            $data = preg_replace("/<(.*?)>/se", "\$this->process_tag(\$this->StripSingle('\\1'))",␉$data);␊
+            foreach (array_keys($this->tag_counts) as $tag) {␊
+                for ($i=0; $i<$this->tag_counts[$tag]; $i++) {␊
+                    $data .= "</$tag>";␊
+                }␊
             }␊
         }␊
         return $data;␊

Download the corresponding diff file

srchub-old

File differences

Branches

Tags