Merge "Import PSR NullLogger instead of using absolute class references"

diff --git a/includes/Title.php b/includes/Title.php
index 28bec0b..95ccd9a 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1770,6 +1770,7 @@ class Title implements LinkTarget, IDBAccessObject {
                if (
                        !MediaWikiServices::getInstance()->getNamespaceInfo()->
                                hasSubpages( $this->mNamespace )
+                       || strtok( $this->getText(), '/' ) === false
                ) {
                        return $this->getText();
                }

diff --git a/includes/libs/http/MultiHttpClient.php b/includes/libs/http/MultiHttpClient.php
index a6135ae..2e418b9 100644 (file)
--- a/includes/libs/http/MultiHttpClient.php
+++ b/includes/libs/http/MultiHttpClient.php
@@ -57,7 +57,7 @@ class MultiHttpClient implements LoggerAwareInterface {
        /** @var float */
        protected $connTimeout = 10;
        /** @var float */
-       protected $reqTimeout = 300;
+       protected $reqTimeout = 900;
        /** @var bool */
        protected $usePipelining = false;
        /** @var int */

diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index d0a95c2..913f56d 100644 (file)
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -554,6 +554,10 @@ class TitleTest extends MediaWikiTestCase {
                        # Title, expected base, optional message
                        [ 'User:John_Doe/subOne/subTwo', 'John Doe' ],
                        [ 'User:Foo / Bar / Baz', 'Foo ' ],
+                       [ 'Talk:////', '////' ],
+                       [ 'Template:////', '////' ],
+                       [ 'Template:Foo////', 'Foo' ],
+                       [ 'Template:Foo////Bar', 'Foo' ],
                ];
        }