Merge "Split DairikiDiff to class per file"

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 0702635..16dc465 100644 (file)
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -77,7 +77,9 @@ abstract class HTMLFormField {
         *
         * @return Message
         */
-       public function msg( ...$args ) {
+       public function msg() {
+               $args = func_get_args();
+
                if ( $this->mParent ) {
                        return $this->mParent->msg( ...$args );
                }

diff --git a/tests/selenium/specs/rollback.js b/tests/selenium/specs/rollback.js
index 648e52f..970fb9e 100644 (file)
--- a/tests/selenium/specs/rollback.js
+++ b/tests/selenium/specs/rollback.js
@@ -48,7 +48,7 @@ describe( 'Rollback with confirmation', function () {
                assert.strictEqual( HistoryPage.rollbackConfirmableNo.getText(), 'Cancel' );
        } );
 
-       it( 'should offer a way to cancel rollbacks', function () {
+       it.skip( 'should offer a way to cancel rollbacks', function () {
                HistoryPage.rollback.click();
 
                browser.pause( 300 );
@@ -60,7 +60,7 @@ describe( 'Rollback with confirmation', function () {
                assert.strictEqual( HistoryPage.heading.getText(), 'Revision history of "' + name + '"' );
        } );
 
-       it( 'should perform rollbacks after confirming intention', function () {
+       it.skip( 'should perform rollbacks after confirming intention', function () {
                HistoryPage.rollback.click();
 
                browser.pause( 300 );