https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102096

Revision: 102096
Author:   reedy
Date:     2011-11-05 14:10:50 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Partial revert to r101244 due to next() weirdness

Modified Paths:
--------------
    trunk/phase3/includes/MagicWord.php

Modified: trunk/phase3/includes/MagicWord.php
===================================================================
--- trunk/phase3/includes/MagicWord.php 2011-11-05 14:05:38 UTC (rev 102095)
+++ trunk/phase3/includes/MagicWord.php 2011-11-05 14:10:50 UTC (rev 102096)
@@ -228,6 +228,7 @@
 
        /**
         * Get an array of parser substitution modifier IDs
+        * @return array
         */
        static function getSubstIDs() {
                return self::$mSubstIDs;
@@ -236,9 +237,10 @@
        /**
         * Allow external reads of TTL array
         *
+        * @param $id int
         * @return array
         */
-       static function getCacheTTL($id) {
+       static function getCacheTTL( $id ) {
                if ( array_key_exists( $id, self::$mCacheTTLs ) ) {
                        return self::$mCacheTTLs[$id];
                } else {
@@ -383,7 +385,7 @@
        /**
         * Returns true if the text contains the word
         *
-        * @paran $text string
+        * @param $text string
         *
         * @return bool
         */
@@ -712,7 +714,7 @@
        /**
         * Get a regex anchored to the start of the string that does not match 
parameters
         *
-        * @return string
+        * @return array
         */
        function getRegexStart() {
                $base = $this->getBaseRegex();
@@ -729,7 +731,7 @@
        /**
         * Get an anchored regex for matching variables with parameters
         *
-        * @return string
+        * @return array
         */
        function getVariableStartToEndRegex() {
                $base = $this->getBaseRegex();
@@ -754,7 +756,7 @@
         */
        function parseMatch( $m ) {
                reset( $m );
-               foreach ( $m as $key => $value ) {
+               while ( list( $key, $value ) = each( $m ) ) {
                        if ( $key === 0 || $value === '' ) {
                                continue;
                        }


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to