Merge "Test ApiMove" into REL1_31

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7667a9e..0152209 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2514,6 +2514,7 @@ function wfDiff( $before, $after, $params = '-u' ) {
  * @throws MWException
  */
 function wfUsePHP( $req_ver ) {
+       wfDeprecated( __FUNCTION__, '1.30' );
        $php_ver = PHP_VERSION;
 
        if ( version_compare( $php_ver, (string)$req_ver, '<' ) ) {

diff --git a/resources/src/mediawiki.action/mediawiki.action.delete.file.js b/resources/src/mediawiki.action/mediawiki.action.delete.file.js
index d6e6796..7dcdc81 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.delete.file.js
+++ b/resources/src/mediawiki.action/mediawiki.action.delete.file.js
@@ -24,7 +24,7 @@
                if ( summaryCodePointLimit ) {
                        $wpReason.codePointLimit( summaryCodePointLimit, filterFn );
                } else if ( summaryByteLimit ) {
-                       $wpReason.bytePointLimit( summaryByteLimit, filterFn );
+                       $wpReason.byteLimit( summaryByteLimit, filterFn );
                }
        } );
 

diff --git a/resources/src/mediawiki.action/mediawiki.action.delete.js b/resources/src/mediawiki.action/mediawiki.action.delete.js
index c353a48..005a8df 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.delete.js
+++ b/resources/src/mediawiki.action/mediawiki.action.delete.js
@@ -24,7 +24,7 @@
                if ( summaryCodePointLimit ) {
                        reason.$input.codePointLimit( summaryCodePointLimit, filterFn );
                } else if ( summaryByteLimit ) {
-                       reason.$input.bytePointLimit( summaryByteLimit, filterFn );
+                       reason.$input.byteLimit( summaryByteLimit, filterFn );
                }
        } );
 }( mediaWiki, jQuery ) );

diff --git a/resources/src/mediawiki.special/mediawiki.special.edittags.js b/resources/src/mediawiki.special/mediawiki.special.edittags.js
index 45c3cf9..4f51e9b 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.edittags.js
+++ b/resources/src/mediawiki.special/mediawiki.special.edittags.js
@@ -31,7 +31,7 @@
                if ( summaryCodePointLimit ) {
                        $wpReason.codePointLimit();
                } else if ( summaryByteLimit ) {
-                       $wpReason.bytePointLimit();
+                       $wpReason.byteLimit();
                }
        } );
 

diff --git a/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js b/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js
index c6d44fa..cad9db0 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js
+++ b/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js
@@ -23,7 +23,7 @@
        if ( summaryCodePointLimit ) {
                $wpReason.codePointLimit( summaryCodePointLimit, filterFn );
        } else if ( summaryByteLimit ) {
-               $wpReason.bytePointLimit( summaryByteLimit, filterFn );
+               $wpReason.byteLimit( summaryByteLimit, filterFn );
        }
 
 }( mediaWiki, jQuery ) );

diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.js b/resources/src/mediawiki.special/mediawiki.special.userrights.js
index 981344d..487e63a 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.js
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.js
@@ -19,7 +19,7 @@
        if ( summaryCodePointLimit ) {
                $wpReason.codePointLimit( summaryCodePointLimit );
        } else if ( summaryByteLimit ) {
-               $wpReason.bytePointLimit( summaryByteLimit );
+               $wpReason.byteLimit( summaryByteLimit );
        }
 
 }( mediaWiki, jQuery ) );