Merge "Fix param doc of MysqlMaintenance::runMysql"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index ae7f68c..00a6ce9 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -150,6 +150,7 @@ because of Phabricator reports.
 * (T195940) Added language support for Batak Mandailing (btm).
 * (T137491) Added language support for Standard Moroccan Amazigh (zgh).
 * (T198132) Added language support for Manipuri (mni).
+* (T201276) Added language support for Western Armenian (hyw).
 
 === Breaking changes in 1.32 ===
 * $wgRequestTime, deprecated in 1.25, was removed. Use

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 277bd02..bd619b1 100644 (file)
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -203,6 +203,7 @@ class Names {
                'hu' => 'magyar', # Hungarian
                'hu-formal' => "magyar (formal)\u{200E}", # Hungarian formal address
                'hy' => 'Հայերեն', # Armenian
+               'hyw' => 'արեւմտահայերէն', # Western Armenian, T201276
                'hz' => 'Otsiherero', # Herero
                'ia' => 'interlingua', # Interlingua (IALA)
                'id' => 'Bahasa Indonesia', # Indonesian
@@ -372,7 +373,7 @@ class Names {
                'rw' => 'Kinyarwanda', # Kinyarwanda, should possibly be Kinyarwandi
                'sa' => 'संस्कृतम्', # Sanskrit
                'sah' => 'саха тыла', # Sakha
-               'sat' => 'Santali', # Santali
+               'sat' => 'ᱥᱟᱱᱛᱟᱲᱤ', # Santali
                'sc' => 'sardu', # Sardinian
                'scn' => 'sicilianu', # Sicilian
                'sco' => 'Scots', # Scots

diff --git a/languages/messages/MessagesHyw.php b/languages/messages/MessagesHyw.php
new file mode 100644 (file)
index 0000000..59e9c86
--- /dev/null
+++ b/languages/messages/MessagesHyw.php
@@ -0,0 +1,11 @@
+<?php
+/** արեւմտահայերէն (Western Armenian)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'hy';

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 471c7ae..45bb6de 100644 (file)
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -221,7 +221,7 @@ class RebuildRecentchanges extends Maintenance {
                                } else {
                                        # No previous edit
                                        $lastOldId = 0;
-                                       $lastSize = null;
+                                       $lastSize = 0;
                                        $new = 1; // probably true
                                }
                        }
@@ -277,17 +277,17 @@ class RebuildRecentchanges extends Maintenance {
                        array_keys( $wgFilterLogTypes ),
                        [ 'create' ] );
 
-               $this->output( "Loading from user, page, and logging tables...\n" );
+               $this->output( "Loading from user and logging tables...\n" );
 
                $commentQuery = $commentStore->getJoin( 'log_comment' );
                $actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
                $res = $dbw->select(
-                       [ 'logging', 'page' ] + $commentQuery['tables'] + $actorQuery['tables'],
+                       [ 'logging' ] + $commentQuery['tables'] + $actorQuery['tables'],
                        [
                                'log_timestamp',
                                'log_namespace',
                                'log_title',
-                               'page_id',
+                               'log_page',
                                'log_type',
                                'log_action',
                                'log_id',
@@ -302,10 +302,7 @@ class RebuildRecentchanges extends Maintenance {
                        ],
                        __METHOD__,
                        [ 'ORDER BY' => 'log_timestamp DESC' ],
-                       [
-                               'page' =>
-                                       [ 'LEFT JOIN', [ 'log_namespace=page_namespace', 'log_title=page_title' ] ]
-                       ] + $commentQuery['joins'] + $actorQuery['joins']
+                       $commentQuery['joins'] + $actorQuery['joins']
                );
 
                $field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
@@ -330,8 +327,8 @@ class RebuildRecentchanges extends Maintenance {
                                        'rc_type' => RC_LOG,
                                        'rc_source' => RecentChange::SRC_LOG,
                                        'rc_cur_id' => $field->isNullable()
-                                               ? $row->page_id
-                                               : (int)$row->page_id, // NULL => 0,
+                                               ? $row->log_page
+                                               : (int)$row->log_page, // NULL => 0,
                                        'rc_log_type' => $row->log_type,
                                        'rc_log_action' => $row->log_action,
                                        'rc_logid' => $row->log_id,