Index: trunk/phase3/includes/OutputPage.php |
— | — | @@ -1614,7 +1614,6 @@ |
1615 | 1615 | global $wgLanguageCode, $wgDebugRedirects, $wgMimeType; |
1616 | 1616 | global $wgUseAjax, $wgAjaxWatch; |
1617 | 1617 | global $wgEnableMWSuggest, $wgUniversalEditButton; |
1618 | | - global $wgArticle; |
1619 | 1618 | |
1620 | 1619 | if( $this->mDoNothing ) { |
1621 | 1620 | return; |
— | — | @@ -1675,7 +1674,7 @@ |
1676 | 1675 | } |
1677 | 1676 | |
1678 | 1677 | if( $wgUniversalEditButton ) { |
1679 | | - if( isset( $wgArticle ) && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' ) |
| 1678 | + if( $this->isArticleRelated() && $this->getTitle() && $this->getTitle()->quickUserCan( 'edit' ) |
1680 | 1679 | && ( $this->getTitle()->exists() || $this->getTitle()->quickUserCan( 'create' ) ) ) { |
1681 | 1680 | // Original UniversalEditButton |
1682 | 1681 | $msg = wfMsg( 'edit' ); |