[phpwiki-checkins] SF.net SVN: phpwiki:[9051] trunk/lib/plugin/CreateToc.php

[<var...@us...>]

Revision: 9051
          http://sourceforge.net/p/phpwiki/code/9051
Author:   vargenau
Date:     2014-08-26 13:05:08 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Fix warnings

Modified Paths:
--------------
    trunk/lib/plugin/CreateToc.php

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2014-08-26 12:10:14 UTC (rev 9050)
+++ trunk/lib/plugin/CreateToc.php	2014-08-26 13:05:08 UTC (rev 9051)
@@ -160,9 +160,9 @@
             if ($theading)
                 return preg_quote($theading->asXML(), "/");
             else
-                return XmlContent::_quote(preg_quote($heading, "/"));
+                return htmlspecialchars(preg_quote($heading, "/"), ENT_COMPAT, 'UTF-8');
         } else {
-            return XmlContent::_quote(preg_quote($heading, "/"));
+            return htmlspecialchars(preg_quote($heading, "/"), ENT_COMPAT, 'UTF-8');
         }
     }
 
@@ -245,8 +245,8 @@
     // We must omit lines starting with "!" if inside a Mediawiki table
     // (they represent a table header)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
-    private function extractHeaders(&$content, &$markup, $backlink = 0,
-                            $counter = 0, $levels = false, $firstlevelstyle = 'number', $basepage = '')
+    private function extractHeaders(&$content, &$markup, $backlink,
+                            $counter, $levels, $firstlevelstyle, $basepage)
     {
         if (!$levels) $levels = array(1, 2);
         $tocCounter = $this->initTocCounter();
@@ -425,7 +425,6 @@
             $r = $page->getCurrentRevision();
         }
 
-        $current = $page->getCurrentRevision();
         $content = $r->getContent();
 
         $html = HTML::div(array('class' => 'toc', 'id' => GenerateId("toc")));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.