BugTrack/2394 Use __construct() instead of old style constructor

[pukiwiki/pukiwiki.git] / lib / make_link.php

diff --git a/lib/make_link.php b/lib/make_link.php
index a83b45f..c72398b 100644 (file)
--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -50,7 +50,7 @@ class InlineConverter
                $this->converters = $converters;
        }
 
-       function InlineConverter($converters = NULL, $excludes = NULL)
+       function __construct($converters = NULL, $excludes = NULL)
        {
                if ($converters === NULL) {
                        $converters = array(
@@ -151,7 +151,7 @@ class Link
        var $alias;
 
        // Constructor
-       function Link($start)
+       function __construct($start)
        {
                $this->start = $start;
        }
@@ -209,9 +209,9 @@ class Link_plugin extends Link
        var $pattern;
        var $plain,$param;
 
-       function Link_plugin($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -278,9 +278,9 @@ EOD;
 // Footnotes
 class Link_note extends Link
 {
-       function Link_note($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -346,9 +346,9 @@ EOD;
 // URLs
 class Link_url extends Link
 {
-       function Link_url($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -393,9 +393,9 @@ EOD;
 // URLs (InterWiki definition on "InterWikiName")
 class Link_url_interwiki extends Link
 {
-       function Link_url_interwiki($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -433,9 +433,9 @@ class Link_mailto extends Link
 {
        var $is_image, $image;
 
-       function Link_mailto($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -475,9 +475,9 @@ class Link_interwikiname extends Link
        var $param  = '';
        var $anchor = '';
 
-       function Link_interwikiname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -544,9 +544,9 @@ class Link_bracketname extends Link
 {
        var $anchor, $refer;
 
-       function Link_bracketname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -606,9 +606,9 @@ EOD;
 // WikiNames
 class Link_wikiname extends Link
 {
-       function Link_wikiname($start)
+       function __construct($start)
        {
-               parent::Link($start);
+               parent::__construct($start);
        }
 
        function get_pattern()
@@ -647,11 +647,11 @@ class Link_autolink extends Link
        var $auto;
        var $auto_a; // alphabet only
 
-       function Link_autolink($start)
+       function __construct($start)
        {
                global $autolink;
 
-               parent::Link($start);
+               parent::__construct($start);
 
                if (! $autolink || ! file_exists(CACHE_DIR . 'autolink.dat'))
                        return;
@@ -693,9 +693,9 @@ class Link_autolink extends Link
 
 class Link_autolink_a extends Link_autolink
 {
-       function Link_autolink_a($start)
+       function __construct($start)
        {
-               parent::Link_autolink($start);
+               parent::__construct($start);
        }
 
        function get_pattern()