Merge "Reduce some code duplication"

[lhc/web/wiklou.git] / includes / parser / LinkHolderArray.php

diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index dc0f933..8546348 100644 (file)
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -25,19 +25,9 @@
  * @ingroup Parser
  */
 class LinkHolderArray {
-       /** @var array */
-       public $internals = array();
-
-       /** @var array */
-       public $interwikis = array();
-
-       /** @var int */
-       protected $size = 0;
-
-       /** @var Parser */
-       protected $parent;
-
-       /** @var int */
+       var $internals = array(), $interwikis = array();
+       var $size = 0;
+       var $parent;
        protected $tempIdOffset;
 
        function __construct( $parent ) {
@@ -161,6 +151,7 @@ class LinkHolderArray {
        /**
         * Get a subset of the current LinkHolderArray which is sufficient to
         * interpret the given text.
+        * @param string $text
         * @return LinkHolderArray
         */
        function getSubArray( $text ) {
@@ -263,12 +254,14 @@ class LinkHolderArray {
        /**
         * Replace <!--LINK--> link placeholders with actual links, in the buffer
         *
+        * @param $text
         * @return array Array of link CSS classes, indexed by PDBK.
         */
        function replace( &$text ) {
                wfProfileIn( __METHOD__ );
 
-               $colours = $this->replaceInternal( $text ); // FIXME: replaceInternal doesn't return a value
+               /** @todo FIXME: replaceInternal doesn't return a value */
+               $colours = $this->replaceInternal( $text );
                $this->replaceInterwiki( $text );
 
                wfProfileOut( __METHOD__ );