Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / TinyMCE / TinyMCEPlugin.php

diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index a5e4a481b8b9fe9162690f7eb543973c9c1d16f4..08da1048fc12f282fee1cac7988c904bd13b6836 100644 (file)
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -79,7 +79,7 @@ class TinyMCEPlugin extends Plugin
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'TinyMCE',
-            'version' => STATUSNET_VERSION,
+            'version' => GNUSOCIAL_VERSION,
             'author' => 'Evan Prodromou',
             'homepage' => 'http://status.net/wiki/Plugin:TinyMCE',
             'rawdescription' =>
@@ -104,17 +104,6 @@ class TinyMCEPlugin extends Plugin
         return htmLawed($raw, $config);
     }
 
-    /**
-     * Strip HTML to plaintext string
-     *
-     * @param string $html HTML
-     * @return string plaintext, single line
-     */
-    private function stripHtml($html)
-    {
-        return str_replace("\n", " ", html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'));
-    }
-
     /**
      * Hook for new-notice form processing to take our HTML goodies;
      * won't affect API posting etc.
@@ -130,7 +119,7 @@ class TinyMCEPlugin extends Plugin
         if ($action->arg('richedit') && $this->isAllowedRichEdit()) {
             $html = $this->sanitizeHtml($content);
             $options['rendered'] = $html;
-            $content = $this->stripHtml($html);
+            $content = common_strip_html($html);
         }
         return true;
     }