Fix for r61391, which broke user JS. Use makeTitleSafe() instead of

newFromText(), use the NS_USER constant directly.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 04f1f04..2d1ea8c 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1725,9 +1725,9 @@ class OutputPage {
                                $this->addInlineScript( $wgRequest->getText( 'wpTextbox1' ) );
                        } else {
                                $userpage = $wgUser->getUserPage();
-                               $scriptpage = Title::newFromText(
-                                       $userpage->getNamespace(),
-                                       $userpage->getPrefixedText() . '/' . $sk->getSkinName() . '.js'
+                               $scriptpage = Title::makeTitleSafe(
+                                       NS_USER,
+                                       $userpage->getDBkey() . '/' . $sk->getSkinName() . '.js'
                                );
                                if ( $scriptpage && $scriptpage->exists() ) {
                                        $userjs = Skin::makeUrl( $scriptpage->getPrefixedText(), 'action=raw&ctype=' . $wgJsMimeType );