Merge "objectcache: Add changeTTL() method"

diff --git a/includes/Title.php b/includes/Title.php
index ea42768..ed445cc 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2319,8 +2319,8 @@ class Title implements LinkTarget {
                        # If the user is allowed to read pages, he is allowed to read all pages
                        $whitelisted = true;
                } elseif ( $this->isSpecial( 'Userlogin' )
-                       || $this->isSpecial( 'ChangePassword' )
                        || $this->isSpecial( 'PasswordReset' )
+                       || $this->isSpecial( 'Userlogout' )
                ) {
                        # Always grant access to the login page.
                        # Even anons need to be able to log in.

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 4a6ac8e..baec396 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -555,7 +555,6 @@ class DifferenceEngine extends ContextSource {
                        // Build the link
                        if ( $rcid ) {
                                $this->getOutput()->preventClickjacking();
-                               $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
                                if ( $wgEnableAPI && $wgEnableWriteAPI
                                        && $user->isAllowed( 'writeapi' )
                                ) {

diff --git a/includes/page/Article.php b/includes/page/Article.php
index f5a860e..6396aaa 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1196,7 +1196,6 @@ class Article implements Page {
                $token = $user->getEditToken( $rcid );
 
                $outputPage->preventClickjacking();
-               $outputPage->addModuleStyles( 'mediawiki.page.patrol' );
                if ( $wgEnableAPI && $wgEnableWriteAPI && $user->isAllowed( 'writeapi' ) ) {
                        $outputPage->addModules( 'mediawiki.page.patrol.ajax' );
                }

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index d2513ed..718a6dc 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -349,7 +349,6 @@ class SpecialNewpages extends IncludableSpecialPage {
 
                if ( $this->patrollable( $result ) ) {
                        $classes[] = 'not-patrolled';
-                       $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
                }
 
                # Add a class for zero byte pages

diff --git a/resources/Resources.php b/resources/Resources.php
index 053c3f3..0d8cfd6 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -333,6 +333,9 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.jStorage' => [
+               'deprecated' => [
+                       'message' => 'Please use "mediawiki.storage" instead.',
+               ],
                'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
                'dependencies' => 'json',
        ],
@@ -370,6 +373,7 @@ return [
        /* jQuery Tipsy */
 
        'jquery.tipsy' => [
+               'deprecated' => true,
                'scripts' => 'resources/src/jquery.tipsy/jquery.tipsy.js',
                'styles' => 'resources/src/jquery.tipsy/jquery.tipsy.css',
        ],
@@ -377,6 +381,9 @@ return [
        /* jQuery UI */
 
        'jquery.ui.core' => [
+               'deprecated' => [
+                       'message' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
+               ],
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js',
                'dependencies' => [
                        'jquery.ui.core.styles',
@@ -655,11 +662,13 @@ return [
                'group' => 'jquery.ui',
        ],
        'jquery.ui.widget' => [
+               'deprecated' => true,
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.widget.js',
                'group' => 'jquery.ui',
        ],
        // Effects
        'jquery.effects.core' => [
+               'deprecated' => true,
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect.js',
                'group' => 'jquery.ui',
        ],
@@ -1707,14 +1716,6 @@ return [
                'position' => 'top',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.page.patrol' => [
-               'position' => 'top',
-               'styles' => [
-                       'resources/src/mediawiki/page/mediawiki.page.patrol.css',
-                       'resources/src/mediawiki/page/mediawiki.page.patrol.print.css'
-                               => [ 'media' => 'print' ],
-               ]
-       ],
        'mediawiki.page.patrol.ajax' => [
                'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js',
                'dependencies' => [

diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index 6a7c76a..d387a2d 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -19,6 +19,7 @@ div#column-one,
 #footer-places,
 .mw-hidden-catlinks,
 .usermessage,
+.patrollink,
 .ns-0 .mw-redirectedfrom,
 div.magnify,
 #mw-navigation,

diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css
index 786f53d..7ccf59e 100644 (file)
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -289,6 +289,11 @@ table.small {
        font-style: italic;
 }
 
+span.unpatrolled {
+       font-weight: bold;
+       color: #f00;
+}
+
 div.gallerybox {
        width: 150px;
 }

diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index 38d2a27..de442e9 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -115,6 +115,23 @@ span.history-deleted {
        font-style: italic;
 }
 
+/**
+ * Patrol stuff
+ */
+.not-patrolled {
+       background-color: #ffa;
+}
+
+.unpatrolled {
+       font-weight: bold;
+       color: #f00;
+}
+
+div.patrollink {
+       font-size: 75%;
+       text-align: right;
+}
+
 /**
  * Forms
  */

diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.css b/resources/src/mediawiki/page/mediawiki.page.patrol.css
deleted file mode 100644 (file)
index f237dbd..0000000
--- a/resources/src/mediawiki/page/mediawiki.page.patrol.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.not-patrolled {
-       background-color: #ffa;
-}
-
-.unpatrolled {
-       font-weight: bold;
-       color: #f00;
-}
-
-.patrollink {
-       font-size: 75%;
-       text-align: right;
-}

diff --git a/resources/src/mediawiki/page/mediawiki.page.patrol.print.css b/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
deleted file mode 100644 (file)
index 497bceb..0000000
--- a/resources/src/mediawiki/page/mediawiki.page.patrol.print.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.patrollink {
-       display: none;
-}

diff --git a/tests/phpunit/includes/skins/SkinTemplateTest.php b/tests/phpunit/includes/skins/SkinTemplateTest.php
index 9e3a620..ff544cd 100644 (file)
--- a/tests/phpunit/includes/skins/SkinTemplateTest.php
+++ b/tests/phpunit/includes/skins/SkinTemplateTest.php
@@ -35,7 +35,7 @@ class SkinTemplateTest extends MediaWikiTestCase {
                                        'text' => 'text'
                                ],
                                [],
-                               'Test makteListItem with normal values'
+                               'Test makeListItem with normal values'
                        ]
                ];
        }