| Index: branches/wmf-deployment/includes/OutputPage.php |
| — | — | @@ -1819,7 +1819,7 @@ |
| 1820 | 1820 | //add user js if enabled: |
| 1821 | 1821 | if( $this->isUserJsAllowed() && $wgUser->isLoggedIn() ) { |
| 1822 | 1822 | $action = $wgRequest->getVal( 'action', 'view' ); |
| 1823 | | - if( $this->mTitle->isJsSubpage() and $sk->userCanPreview( $action ) ) { |
| | 1823 | + if( $this->mTitle && $this->mTitle->isJsSubpage() and $sk->userCanPreview( $action ) ) { |
| 1824 | 1824 | # XXX: additional security check/prompt? |
| 1825 | 1825 | $this->addInlineScript( $wgRequest->getText( 'wpTextbox1' ) ); |
| 1826 | 1826 | } else { |
| Property changes on: branches/wmf-deployment/includes/OutputPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1827 | 1827 | + /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381 |
| /trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472 |