Merge "Updated Revision::newFromId() callers to use READ_LATEST as needed"

diff --git a/includes/content/AbstractContent.php b/includes/content/AbstractContent.php
index d8fca4d..6542d7d 100644 (file)
--- a/includes/content/AbstractContent.php
+++ b/includes/content/AbstractContent.php
@@ -393,7 +393,7 @@ abstract class AbstractContent implements Content {
         *
         * @see Content::prepareSave
         */
-       public function prepareSave( WikiPage $page, $flags, $baseRevId, User $user ) {
+       public function prepareSave( WikiPage $page, $flags, $parentRevId, User $user ) {
                if ( $this->isValid() ) {
                        return Status::newGood();
                } else {

diff --git a/includes/content/Content.php b/includes/content/Content.php
index 5823a9a..8ed761f 100644 (file)
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@ -464,7 +464,7 @@ interface Content {
         *
         * @param WikiPage $page The page to be saved.
         * @param int $flags Bitfield for use with EDIT_XXX constants, see WikiPage::doEditContent()
-        * @param int $baseRevId The ID of the current revision
+        * @param int $parentRevId The ID of the current revision
         * @param User $user
         *
         * @return Status A status object indicating whether the content was
@@ -473,7 +473,7 @@ interface Content {
         *
         * @see WikiPage::doEditContent()
         */
-       public function prepareSave( WikiPage $page, $flags, $baseRevId, User $user );
+       public function prepareSave( WikiPage $page, $flags, $parentRevId, User $user );
 
        /**
         * Returns a list of updates to perform when this content is deleted.

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 23bbc7c..285611d 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1608,7 +1608,9 @@ class WikiPage implements Page, IDBAccessObject {
         * error will be returned. These two conditions are also possible with
         * auto-detection due to MediaWiki's performance-optimised locking strategy.
         *
-        * @param bool|int $baseRevId The revision ID this edit was based off, if any
+        * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+        *   This is not the parent revision ID, rather the revision ID for older
+        *   content used as the source for a rollback, for example.
         * @param User $user The user doing the edit
         *
         * @throws MWException
@@ -1668,7 +1670,9 @@ class WikiPage implements Page, IDBAccessObject {
         * error will be returned. These two conditions are also possible with
         * auto-detection due to MediaWiki's performance-optimised locking strategy.
         *
-        * @param bool|int $baseRevId The revision ID this edit was based off, if any
+        * @param bool|int $baseRevId The revision ID this edit was based off, if any.
+        *   This is not the parent revision ID, rather the revision ID for older
+        *   content used as the source for a rollback, for example.
         * @param User $user The user doing the edit
         * @param string $serialFormat Format for storing the content in the
         *   database.
@@ -1802,7 +1806,7 @@ class WikiPage implements Page, IDBAccessObject {
                                $dbw->begin( __METHOD__ );
                                try {
 
-                                       $prepStatus = $content->prepareSave( $this, $flags, $baseRevId, $user );
+                                       $prepStatus = $content->prepareSave( $this, $flags, $oldid, $user );
                                        $status->merge( $prepStatus );
 
                                        if ( !$status->isOK() ) {
@@ -1881,7 +1885,7 @@ class WikiPage implements Page, IDBAccessObject {
                        $dbw->begin( __METHOD__ );
                        try {
 
-                               $prepStatus = $content->prepareSave( $this, $flags, $baseRevId, $user );
+                               $prepStatus = $content->prepareSave( $this, $flags, $oldid, $user );
                                $status->merge( $prepStatus );
 
                                if ( !$status->isOK() ) {

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
index 16b56f8..cdf7721 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-bell {
        background-image: url("themes/mediawiki/images/icons/bell.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
index c245572..f919ec4 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-article {
        background-image: url("themes/mediawiki/images/icons/article-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
index 6a21ffa..6c866ab 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-table {
        background-image: url("themes/mediawiki/images/icons/table.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
index 295ee84..37a8562 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-edit {
        background-image: url("themes/mediawiki/images/icons/edit-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
index 1b97103..8bebff8 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-indent {
        background-image: url("themes/mediawiki/images/icons/indent-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
index e15f42f..fdda7c0 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-bigger {
        background-image: url("themes/mediawiki/images/icons/bigger-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
index d7a4437..e13873f 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-beta {
        background-image: url("themes/mediawiki/images/icons/beta.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
index 4d4a530..b23bdea 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-stripeFlow {
        background-image: url("themes/mediawiki/images/icons/stripeFlow-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
index 1445b0c..d200ef2 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-map {
        background-image: url("themes/mediawiki/images/icons/map-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
index 250aa47..babb93f 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-image {
        background-image: url("themes/mediawiki/images/icons/image-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
index 21b8777..4de7472 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-block {
        background-image: url("themes/mediawiki/images/icons/block.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
index 9d3e077..b54c204 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-arrowNext {
        background-image: url("themes/mediawiki/images/icons/arrow-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
index bb8aec8..30b4b33 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-userActive {
        background-image: url("themes/mediawiki/images/icons/userActive-ltr.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
index 5c76560..b03fd4d 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-icon-logoCC {
        background-image: url("themes/mediawiki/images/icons/logo-cc.png");

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index 0a9c457..8b82ca2 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:09:07Z
+ * Date: 2015-03-12T23:44:05Z
  */
 .oo-ui-progressBarWidget-slide-frames from {
        margin-left: -40%;
@@ -1056,6 +1056,9 @@
 .oo-ui-toolbar-narrow .oo-ui-toolbar-tools {
        white-space: normal;
 }
+.oo-ui-toolbar-tools .oo-ui-tool {
+       white-space: normal;
+}
 .oo-ui-toolbar-tools,
 .oo-ui-toolbar-actions,
 .oo-ui-toolbar-shadow {
@@ -2511,10 +2514,10 @@
             -o-transform: scale(1);
                transform: scale(1);
 }
-.oo-ui-windowManager-fullscreen.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame {
-       border: 0;
-       border-radius: 0;
-       box-shadow: none;
+.oo-ui-windowManager-modal.oo-ui-windowManager-floating > .oo-ui-dialog > .oo-ui-window-frame {
+       border: 1px solid #aaaaaa;
+       border-radius: 0.2em;
+       box-shadow: inset 0 -0.2em 0 0 rgba(0, 0, 0, 0.2);
 }
 
 .oo-ui-icon-add {

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 4dfc0fb..889b4e1 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:08:47Z
+ * Date: 2015-03-12T23:43:45Z
  */
 /**
  * @class

diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 065edfc..b570130 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.9.1
+ * OOjs UI v0.9.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-03-12T19:08:47Z
+ * Date: 2015-03-12T23:43:45Z
  */
 ( function ( OO ) {
 
@@ -1756,11 +1756,7 @@ OO.ui.Window = function OoUiWindow( config ) {
        // Properties
        this.manager = null;
        this.size = config.size || this.constructor.static.size;
-       this.frame = new OO.ui.PanelLayout( {
-               expanded: false,
-               framed: true
-       } );
-       this.$frame = this.frame.$element;
+       this.$frame = $( '<div>' );
        this.$overlay = $( '<div>' );
        this.$content = $( '<div>' );
 

diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
index 22d2af1..0cb9cc8 100644 (file)
--- a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js
@@ -60,7 +60,7 @@
                                );
 
                                QUnit.start();
-                       }, 10 );
+                       } );
                } );
        }
 

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 4a5705a..18db7f1 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -377,7 +377,7 @@
                                return;
                        }
                        // Otherwise, keep polling
-                       setTimeout( styleTestLoop, 150 );
+                       setTimeout( styleTestLoop );
                }
 
                // Start the loop