Merge "Put page_is_new back into ContribsPager query"

diff --git a/includes/Revision.php b/includes/Revision.php
index f9810a0..518360c 100644 (file)
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -426,6 +426,7 @@ class Revision implements IDBAccessObject {
         * @return array
         */
        public static function userJoinCond() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] ];
        }
 
@@ -437,6 +438,7 @@ class Revision implements IDBAccessObject {
         * @return array
         */
        public static function pageJoinCond() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [ 'INNER JOIN', [ 'page_id = rev_page' ] ];
        }
 
@@ -449,6 +451,8 @@ class Revision implements IDBAccessObject {
        public static function selectFields() {
                global $wgContentHandlerUseDB;
 
+               wfDeprecated( __METHOD__, '1.31' );
+
                $fields = [
                        'rev_id',
                        'rev_page',
@@ -481,6 +485,9 @@ class Revision implements IDBAccessObject {
         */
        public static function selectArchiveFields() {
                global $wgContentHandlerUseDB;
+
+               wfDeprecated( __METHOD__, '1.31' );
+
                $fields = [
                        'ar_id',
                        'ar_page_id',
@@ -513,6 +520,7 @@ class Revision implements IDBAccessObject {
         * @return array
         */
        public static function selectTextFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'old_text',
                        'old_flags'
@@ -525,6 +533,7 @@ class Revision implements IDBAccessObject {
         * @return array
         */
        public static function selectPageFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'page_namespace',
                        'page_title',
@@ -541,6 +550,7 @@ class Revision implements IDBAccessObject {
         * @return array
         */
        public static function selectUserFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [ 'user_name' ];
        }
 

diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index bb24120..a471865 100644 (file)
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -210,6 +210,7 @@ class RecentChange {
         * @return array
         */
        public static function selectFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'rc_id',
                        'rc_timestamp',

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 0b730f6..44c90af 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -200,6 +200,7 @@ class LocalFile extends File {
         * @return array
         */
        static function selectFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'img_name',
                        'img_size',

diff --git a/includes/filerepo/file/OldLocalFile.php b/includes/filerepo/file/OldLocalFile.php
index 6833a38..69e6896 100644 (file)
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -110,6 +110,7 @@ class OldLocalFile extends LocalFile {
         * @return array
         */
        static function selectFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'oi_name',
                        'oi_archive_name',

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 946c7f0..1047a93 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -286,6 +286,8 @@ class WikiPage implements Page, IDBAccessObject {
        public static function selectFields() {
                global $wgContentHandlerUseDB, $wgPageLanguageUseDB;
 
+               wfDeprecated( __METHOD__, '1.31' );
+
                $fields = [
                        'page_id',
                        'page_namespace',

diff --git a/includes/user/User.php b/includes/user/User.php
index d397962..854ebbd 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -5508,6 +5508,7 @@ class User implements IDBAccessObject {
         * @return array
         */
        public static function selectFields() {
+               wfDeprecated( __METHOD__, '1.31' );
                return [
                        'user_id',
                        'user_name',

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
index d940321..7b54833 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
@@ -80,29 +80,24 @@
        };
 
        /**
-        * Get a prefixed label
+        * Get the message key to use to wrap the label. This message takes the label as a parameter.
         *
-        * @param {boolean} inverted This item should be considered inverted
-        * @return {string} Prefixed label
+        * @param {boolean} inverted Whether this item should be considered inverted
+        * @return {string|null} Message key, or null if no message
         */
-       mw.rcfilters.dm.ItemModel.prototype.getPrefixedLabel = function ( inverted ) {
+       mw.rcfilters.dm.ItemModel.prototype.getLabelMessageKey = function ( inverted ) {
                if ( this.labelPrefixKey ) {
                        if ( typeof this.labelPrefixKey === 'string' ) {
-                               return mw.message( this.labelPrefixKey, this.getLabel() ).parse();
-                       } else {
-                               return mw.message(
-                                       this.labelPrefixKey[
-                                               // Only use inverted-prefix if the item is selected
-                                               // Highlight-only an inverted item makes no sense
-                                               inverted && this.isSelected() ?
-                                                       'inverted' : 'default'
-                                       ],
-                                       this.getLabel()
-                               ).parse();
+                               return this.labelPrefixKey;
                        }
-               } else {
-                       return this.getLabel();
+                       return this.labelPrefixKey[
+                               // Only use inverted-prefix if the item is selected
+                               // Highlight-only an inverted item makes no sense
+                               inverted && this.isSelected() ?
+                                       'inverted' : 'default'
+                       ];
                }
+               return null;
        };
 
        /**

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index dd095dd..14f0f6b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -12,6 +12,7 @@
                                rcTopSection,
                                $watchlistDetails,
                                wlTopSection,
+                               namespaces,
                                savedQueriesPreferenceName = mw.config.get( 'wgStructuredChangeFiltersSavedQueriesPreferenceName' ),
                                filtersModel = new mw.rcfilters.dm.FiltersViewModel(),
                                changesListModel = new mw.rcfilters.dm.ChangesListViewModel(),
@@ -44,9 +45,13 @@
                        // call will do that and add the -loading class right back.
                        $( 'body' ).removeClass( 'mw-rcfilters-ui-loading' );
 
+                       // Remove Media namespace
+                       namespaces = mw.config.get( 'wgFormattedNamespaces' );
+                       delete namespaces[ mw.config.get( 'wgNamespaceIds' ).media ];
+
                        controller.initialize(
                                mw.config.get( 'wgStructuredChangeFilters' ),
-                               mw.config.get( 'wgFormattedNamespaces' ),
+                               namespaces,
                                mw.config.get( 'wgRCFiltersChangeTags' )
                        );
 

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
index 7e324b6..13d6b68 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
@@ -84,11 +84,17 @@
         * Respond to model update event
         */
        mw.rcfilters.ui.TagItemWidget.prototype.updateUiBasedOnState = function () {
-               this.setCurrentMuteState();
-
                // Update label if needed
-               this.setLabel( $( '<div>' ).html( this.itemModel.getPrefixedLabel( this.invertModel.isSelected() ) ).contents() );
+               var labelMsg = this.itemModel.getLabelMessageKey( this.invertModel.isSelected() );
+               if ( labelMsg ) {
+                       this.setLabel( $( '<div>' ).html(
+                               mw.message( labelMsg, mw.html.escape( this.itemModel.getLabel() ) ).parse()
+                       ).contents() );
+               } else {
+                       this.setLabel( this.itemModel.getLabel() );
+               }
 
+               this.setCurrentMuteState();
                this.setHighlightColor();
        };