[phpwiki-checkins] SF.net SVN: phpwiki:[8989] trunk/lib/WikiTheme.php

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

Revision: 8989
          http://sourceforge.net/p/phpwiki/code/8989
Author:   vargenau
Date:     2014-07-18 12:48:51 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Revert parent::__construct

Modified Paths:
--------------
    trunk/lib/WikiTheme.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014-07-18 12:23:23 UTC (rev 8988)
+++ trunk/lib/WikiTheme.php	2014-07-18 12:48:51 UTC (rev 8989)
@@ -1680,13 +1680,14 @@
  */
 class Button extends HtmlElement
 {
-    /**
+    /** Constructor
+     *
      * @param string $text The text for the button.
      * @param string $url The url (href) for the button.
      * @param string $class The CSS class for the button.
      * @param array $options  Additional attributes for the <input> tag.
      */
-    function __construct($text, $url, $class = '', $options = array())
+    function Button($text, $url, $class = '', $options = array())
     {
         global $request;
         $this->_init('a', array('href' => $url));
@@ -1713,16 +1714,17 @@
  */
 class ImageButton extends Button
 {
-    /**
+    /** Constructor
+     *
      * @param $text string The text for the button.
      * @param $url string The url (href) for the button.
      * @param $class string The CSS class for the button.
      * @param $img_url string URL for button's image.
      * @param $img_attr array Additional attributes for the <img> tag.
      */
-    function __construct($text, $url, $class, $img_url, $img_attr = array())
+    function ImageButton($text, $url, $class, $img_url, $img_attr = array())
     {
-        parent::__construct('a', array('href' => $url));
+        $this->__construct('a', array('href' => $url));
         if ($class)
             $this->setAttr('class', $class);
         // Google honors this
@@ -1745,7 +1747,8 @@
  */
 class SubmitButton extends HtmlElement
 {
-    /**
+    /** Constructor
+     *
      * @param $text string The text for the button.
      * @param $name string The name of the form field.
      * @param $class string The CSS class for the button.
@@ -1753,7 +1756,8 @@
      */
     function SubmitButton($text, $name = '', $class = '', $options = array())
     {
-        parent::__construct('input', array('type' => 'submit', 'value' => $text));
+        $this->__construct('input', array('type' => 'submit',
+            'value' => $text));
         if ($name)
             $this->setAttr('name', $name);
         if ($class)
@@ -1771,16 +1775,17 @@
  */
 class SubmitImageButton extends SubmitButton
 {
-    /**
+    /** Constructor
+     *
      * @param $text string The text for the button.
      * @param $name string The name of the form field.
      * @param $class string The CSS class for the button.
      * @param $img_url string URL for button's image.
      * @param $img_attr array Additional attributes for the <img> tag.
      */
-    function __construct($text, $name = '', $class = '', $img_url, $img_attr = array())
+    function SubmitImageButton($text, $name = '', $class = '', $img_url, $img_attr = array())
     {
-        parent::__construct('input', array('type' => 'image',
+        $this->__construct('input', array('type' => 'image',
             'src' => $img_url,
             'alt' => $text));
         if ($name)

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