Merge "Linker: Simplify return paths"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index c9bd093..80e3bbd 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -79,6 +79,8 @@ production.
 * (T212356) When using action=delete on pages with many revisions, the module
   may return a boolean-true 'scheduled' and no 'logid'. This signifies that the
   deletion will be processed via the job queue.
+* action=setnotificationtimestamp will now update the watchlist asynchronously
+  if entirewatchlist is set, so updates may not be visible immediately
 
 === Action API internal changes in 1.33 ===
 * A number of deprecated methods for API documentation, intended for overriding
@@ -105,6 +107,7 @@ because of Phabricator reports.
 * (T203908) Added language support for Eastern Pwo (kjp).
 * (T213717) Fixed a translation error on Goan Konkani (gom-deva) translations
   for NS_TEMPLATE.
+* (T212221) Added $digitTransformTable for Santali (sat).
 
 === Breaking changes in 1.33 ===
 * The parameteter $lang in DifferenceEngine::setTextLanguage must be of type

diff --git a/includes/api/ApiSetNotificationTimestamp.php b/includes/api/ApiSetNotificationTimestamp.php
index b81c5bf..41c207b 100644 (file)
--- a/includes/api/ApiSetNotificationTimestamp.php
+++ b/includes/api/ApiSetNotificationTimestamp.php
@@ -108,10 +108,14 @@ class ApiSetNotificationTimestamp extends ApiBase {
                $result = [];
                if ( $params['entirewatchlist'] ) {
                        // Entire watchlist mode: Just update the thing and return a success indicator
-                       $watchedItemStore->setNotificationTimestampsForUser(
-                               $user,
-                               $timestamp
-                       );
+                       if ( is_null( $timestamp ) ) {
+                               $watchedItemStore->resetAllNotificationTimestampsForUser( $user );
+                       } else {
+                               $watchedItemStore->setNotificationTimestampsForUser(
+                                       $user,
+                                       $timestamp
+                               );
+                       }
 
                        $result['notificationtimestamp'] = is_null( $timestamp )
                                ? ''

diff --git a/languages/messages/MessagesSat.php b/languages/messages/MessagesSat.php
index 9dbb838..20fdc2c 100644 (file)
--- a/languages/messages/MessagesSat.php
+++ b/languages/messages/MessagesSat.php
@@ -27,3 +27,16 @@ $namespaceNames = [
        NS_CATEGORY         => 'ᱛᱷᱚᱠ',
        NS_CATEGORY_TALK    => 'ᱛᱷᱚᱠ_ᱜᱟᱞᱢᱟᱨᱟᱣ',
 ];
+
+$digitTransformTable = [
+       '0' => '᱐',
+       '1' => '᱑',
+       '2' => '᱒',
+       '3' => '᱓',
+       '4' => '᱔',
+       '5' => '᱕',
+       '6' => '᱖',
+       '7' => '᱗',
+       '8' => '᱘',
+       '9' => '᱙',
+];