Merge "WebStart: Remove redundant unset() for $IP"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 5d426f1..941cf3f 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -43,7 +43,8 @@ changes to languages because of Phabricator reports.
 * …
 
 === Deprecations in 1.32 ===
-* …
+* Use of a StartProfiler.php file is deprecated in favour of placing
+  configuration in LocalSettings.php.
 
 === Other changes in 1.32 ===
 * …

diff --git a/includes/Setup.php b/includes/Setup.php
index ac47b6f..6513cdd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -80,7 +80,7 @@ MediaWiki\HeaderCallback::register();
  */
 
 if ( is_readable( "$IP/StartProfiler.php" ) ) {
-       // @deprecated since 1.31: Use LocalSettings.php instead.
+       // @deprecated since 1.32: Use LocalSettings.php instead.
        require "$IP/StartProfiler.php";
 }
 

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index a60549b..146e6e7 100644 (file)
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -168,7 +168,11 @@ class SpecialStatistics extends SpecialPage {
                        Xml::tags( 'th', [ 'colspan' => '2' ],
                                $this->msg( 'statistics-header-users' )->parse() ) .
                        Xml::closeElement( 'tr' ) .
-                       $this->formatRow( $this->msg( 'statistics-users' )->parse(),
+                       $this->formatRow( $this->msg( 'statistics-users' )->parse() . ' ' .
+                               $this->getLinkRenderer()->makeKnownLink(
+                                       SpecialPage::getTitleFor( 'ListUsers' ),
+                                       $this->msg( 'listgrouprights-members' )->text()
+                               ),
                                $this->getLanguage()->formatNum( $this->users ),
                                [ 'class' => 'mw-statistics-users' ]
                        ) .

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 168ce07..350c348 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1914,7 +1914,7 @@
        "statistics-files": "Uploaded files",
        "statistics-edits": "Page edits since {{SITENAME}} was set up",
        "statistics-edits-average": "Average edits per page",
-       "statistics-users": "Registered [[Special:ListUsers|users]]",
+       "statistics-users": "Registered users",
        "statistics-users-active": "Active users",
        "statistics-users-active-desc": "Users who have performed an action in the last {{PLURAL:$1|day|$1 days}}",
        "statistics-footer": "",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e7da4c6..c07c1fa 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2111,7 +2111,7 @@
        "statistics-files": "Used in [[Special:Statistics]].\n{{Identical|Uploaded file}}",
        "statistics-edits": "Used in [[Special:Statistics]]",
        "statistics-edits-average": "Used in [[Special:Statistics]]",
-       "statistics-users": "{{doc-important|Do not translate \"Special:ListUsers\"}}\nUsed in [[Special:Statistics]].",
+       "statistics-users": "Used in [[Special:Statistics]].",
        "statistics-users-active": "Used in [[Special:Statistics]]",
        "statistics-users-active-desc": "Description shown beneath ''Active users'' in [[Special:Statistics]]. Parameters:\n* $1 - Value of <code>$wgRCMaxAge</code> in days",
        "statistics-footer": "{{notranslate}}",

diff --git a/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php b/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
index fa4d804..4d98773 100644 (file)
--- a/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
+++ b/tests/phpunit/includes/resourceloader/MessageBlobStoreTest.php
@@ -103,6 +103,11 @@ class MessageBlobStoreTest extends PHPUnit\Framework\TestCase {
                $this->assertEquals( '{"foo":"Example"}', $blob, 'Generated blob' );
        }
 
+       /**
+        * Seems to fail sometimes (T176097).
+        *
+        * @group Broken
+        */
        public function testGetBlobCached() {
                $module = $this->makeModule( [ 'example' ] );
                $rl = new ResourceLoader();