Merge "WLFilters: convert 'edit watchlist' button to new UX"

diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php
index 38cb6be..30d105b 100644 (file)
--- a/includes/cache/LinkBatch.php
+++ b/includes/cache/LinkBatch.php
@@ -43,7 +43,7 @@ class LinkBatch {
        protected $caller;
 
        /**
-        * @param LinkTarget[] $arr Initial items to be added to the batch
+        * @param Traversable|LinkTarget[] $arr Initial items to be added to the batch
         */
        public function __construct( $arr = [] ) {
                foreach ( $arr as $item ) {

diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php
index 470086a..7fafc0e 100644 (file)
--- a/includes/deferred/CdnCacheUpdate.php
+++ b/includes/deferred/CdnCacheUpdate.php
@@ -49,11 +49,12 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
        /**
         * Create an update object from an array of Title objects, or a TitleArray object
         *
-        * @param Traversable|array $titles
+        * @param Traversable|Title[] $titles
         * @param string[] $urlArr
         * @return CdnCacheUpdate
         */
        public static function newFromTitles( $titles, $urlArr = [] ) {
+               ( new LinkBatch( $titles ) )->execute();
                /** @var Title $title */
                foreach ( $titles as $title ) {
                        $urlArr = array_merge( $urlArr, $title->getCdnUrls() );

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index dae2c40..816c9be 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1386,7 +1386,7 @@
        "rcfilters-empty-filter": "No active filters. All contributions are shown.",
        "rcfilters-filterlist-title": "Filters",
        "rcfilters-filterlist-whatsthis": "How do these work?",
-       "rcfilters-filterlist-feedbacklink": "Provide feedback on the new (beta) filters",
+       "rcfilters-filterlist-feedbacklink": "Tell us what you think about these (new) filtering tools",
        "rcfilters-highlightbutton-title": "Highlight results",
        "rcfilters-highlightmenu-title": "Select a color",
        "rcfilters-highlightmenu-help": "Select a color to highlight this property",

diff --git a/maintenance/archives/patch-comment-table.sql b/maintenance/archives/patch-comment-table.sql
index 60c58d6..c8bf958 100644 (file)
--- a/maintenance/archives/patch-comment-table.sql
+++ b/maintenance/archives/patch-comment-table.sql
@@ -9,7 +9,7 @@ CREATE TABLE /*_*/comment (
   comment_text BLOB NOT NULL,
   comment_data BLOB
 ) /*$wgDBTableOptions*/;
-CREATE INDEX /*i*/comment_hash ON comment (comment_hash);
+CREATE INDEX /*i*/comment_hash ON /*_*/comment (comment_hash);
 
 CREATE TABLE /*_*/revision_comment_temp (
   revcomment_rev int unsigned NOT NULL,

diff --git a/maintenance/postgres/archives/patch-comment-table.sql b/maintenance/postgres/archives/patch-comment-table.sql
index a84986f..8f2b3f3 100644 (file)
--- a/maintenance/postgres/archives/patch-comment-table.sql
+++ b/maintenance/postgres/archives/patch-comment-table.sql
@@ -24,4 +24,4 @@ CREATE TABLE image_comment_temp (
        imgcomment_comment_id INTEGER NOT NULL,
        PRIMARY KEY (imgcomment_name, imgcomment_comment_id)
 );
-CREATE UNIQUE INDEX imgcomment_name ON image_comment_temp (imgcomment_rev);
+CREATE UNIQUE INDEX imgcomment_name ON image_comment_temp (imgcomment_name);

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 3516a3b..c7ace89 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -361,7 +361,7 @@ CREATE TABLE image_comment_temp (
        imgcomment_comment_id INTEGER NOT NULL,
        PRIMARY KEY (imgcomment_name, imgcomment_comment_id)
 );
-CREATE UNIQUE INDEX imgcomment_name ON image_comment_temp (imgcomment_rev);
+CREATE UNIQUE INDEX imgcomment_name ON image_comment_temp (imgcomment_name);
 
 CREATE TABLE oldimage (
   oi_name          TEXT         NOT NULL,

diff --git a/maintenance/sqlite/archives/patch-comment-table.sql b/maintenance/sqlite/archives/patch-comment-table.sql
index 2017eca..f743b55 100644 (file)
--- a/maintenance/sqlite/archives/patch-comment-table.sql
+++ b/maintenance/sqlite/archives/patch-comment-table.sql
@@ -10,7 +10,7 @@ CREATE TABLE /*_*/comment (
   comment_text BLOB NOT NULL,
   comment_data BLOB
 ) /*$wgDBTableOptions*/;
-CREATE INDEX /*i*/comment_hash ON comment (comment_hash);
+CREATE INDEX /*i*/comment_hash ON /*_*/comment (comment_hash);
 
 CREATE TABLE /*_*/revision_comment_temp (
   revcomment_rev int unsigned NOT NULL,

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 3836665..d6ef40c 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -521,7 +521,7 @@ CREATE TABLE /*_*/comment (
   comment_data BLOB
 ) /*$wgDBTableOptions*/;
 -- Index used for deduplication.
-CREATE INDEX /*i*/comment_hash ON comment (comment_hash);
+CREATE INDEX /*i*/comment_hash ON /*_*/comment (comment_hash);
 
 
 --

diff --git a/resources/src/mediawiki.toolbar/images/ksh/LICENSE b/resources/src/mediawiki.toolbar/images/ksh/LICENSE
index 47ecfe4..640bbff 100644 (file)
--- a/resources/src/mediawiki.toolbar/images/ksh/LICENSE
+++ b/resources/src/mediawiki.toolbar/images/ksh/LICENSE
@@ -1,7 +1,7 @@
 
 button_italic.png
 -------------------
-Source : http://commons.wikimedia.org/wiki/Image:Button_S_italic.png
+Source : https://commons.wikimedia.org/wiki/Image:Button_S_italic.png
 License: Public domain
-Author : Purodha Blissenbach, http://ksh.wikipedia.org/wiki/User:Purodha
+Author : Purodha Blissenbach, https://ksh.wikipedia.org/wiki/User:Purodha