reStructuredText output

[grauphel.git] / lib / converter / html.php

diff --git a/lib/converter/html.php b/lib/converter/html.php
index eeb2b665c594dcf7130a15b5275a79269eebb38e..a6a92bc6e9693f8c74ceb60aa3bffcd688248530 100644 (file)
--- a/lib/converter/html.php
+++ b/lib/converter/html.php
@@ -30,7 +30,7 @@ use \XMLReader;
  * @version   Release: @package_version@
  * @link      http://cweiske.de/grauphel.htm
  */
-class Html
+class Html extends Base
 {
     protected static $tagMap = array(
         'list'      => 'ul',
@@ -159,39 +159,5 @@ class Html
     {
         return $linkUrl . '.htm';
     }
-
-    /**
-     * Re-arranges the XML of formatted links to that clean link tags can
-     * be generated.
-     *
-     * Tomboy 1.15.2 allows link formatting, and the resulting XML is a
-     * mess of multiple(!) link tags that are within or around other formatting
-     * tags.
-     *
-     * This method tries to re-arrange the links so that only a single link tag
-     * appears with all the formatting inside.
-     * 
-     * @param string $xmlContent Tomboy note content
-     *
-     * @return string XML content, with re-arranged link tags.
-     */
-    protected function fixNastyLinks($xmlContent)
-    {
-        preg_match_all(
-            '#(?:<.*>)?<link:internal>.+</link:internal><link:internal>.+</link:internal>#U',
-            $xmlContent,
-            $matches
-        );
-
-        foreach ($matches[0] as $nastyLink) {
-            $cleaner = str_replace('</link:internal><link:internal>', '', $nastyLink);
-            $cleaner = preg_replace('#<([a-z]+)><(link:internal)>#U', '<\2><\1>', $cleaner);
-            $cleaner = preg_replace('#</(link:internal)></([a-z]+)>#U', '</\2></\1>', $cleaner);
-            $cleaner = str_replace('</link:internal><link:internal>', '', $cleaner);
-            $xmlContent = str_replace($nastyLink, $cleaner, $xmlContent);
-        }
-
-        return $xmlContent;
-    }
 }
 ?>