[phpwiki-checkins] SF.net SVN: phpwiki:[9306] trunk/lib/WysiwygEdit/Wikiwyg.php

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

Revision: 9306
          http://sourceforge.net/p/phpwiki/code/9306
Author:   vargenau
Date:     2014-11-11 19:56:43 +0000 (Tue, 11 Nov 2014)
Log Message:
-----------
Use __construct; PHP Doc

Modified Paths:
--------------
    trunk/lib/WysiwygEdit/Wikiwyg.php

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2014-11-11 14:14:55 UTC (rev 9305)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2014-11-11 19:56:43 UTC (rev 9306)
@@ -20,7 +20,6 @@
 
     function __construct()
     {
-        global $request, $LANG;
         $this->_transformer_tags = false;
         $this->BasePath = DATA_PATH . '/themes/default/Wikiwyg';
         $this->_htmltextid = "edit-content";
@@ -96,6 +95,7 @@
             wikiwyg.editMode();}"
             );
         }
+        return '';
     }
 
     function Textarea($textarea, $wikitext, $name = 'edit[content]')
@@ -121,15 +121,21 @@
      * Handler to convert the Wiki Markup to HTML before editing.
      * This will be converted back by WysiwygEdit_ConvertAfter if required.
      *  *text* => '<b>text<b>'
+     *
+     * @param string $text
+     * @return string
      */
     function ConvertBefore($text)
     {
         return $text;
     }
 
-    /*
+    /**
      * No special PHP HTML->Wikitext conversion needed. This is done in js thanksfully.
      * Avoided in editpage.php: PageEditor->getContent
+     *
+     * @param string $text
+     * @return string
      */
     function ConvertAfter($text)
     {
@@ -139,7 +145,7 @@
 
 class WikiToHtml
 {
-    function WikiToHtml($wikitext, &$request)
+    function __construct($wikitext, &$request)
     {
         $this->_wikitext = $wikitext;
         $this->_request =& $request;

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