| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | * @param string $name Human-readable name if a string address is given |
| 41 | 41 | */ |
| 42 | 42 | function MailAddress( $address, $name=null ) { |
| 43 | | - if( is_object( $address ) && is_a( $address, 'User' ) ) { |
| | 43 | + if( is_object( $address ) && $address instanceof User ) { |
| 44 | 44 | $this->address = $address->getEmail(); |
| 45 | 45 | $this->name = $address->getName(); |
| 46 | 46 | } else { |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | function getHeadScripts() { |
| 302 | 302 | global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType, $wgStyleVersion; |
| 303 | 303 | global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang; |
| 304 | | - global $wgTitle, $wgCanonicalNamespaceNames, $wgOut; |
| | 304 | + global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle, $wgRequest; |
| 305 | 305 | |
| 306 | 306 | $ns = $wgTitle->getNamespace(); |
| 307 | 307 | $nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText(); |
| — | — | @@ -317,6 +317,8 @@ |
| 318 | 318 | 'titleprefixeddbkey' => $wgTitle->getPrefixedDBKey(), |
| 319 | 319 | 'titletext' => $wgTitle->getText(), |
| 320 | 320 | 'articleid' => $wgTitle->getArticleId(), |
| | 321 | + 'currevisionid' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0, |
| | 322 | + 'oldid' => $wgRequest->getVal( 'oldid' ), |
| 321 | 323 | 'isarticle' => $wgOut->isArticle(), |
| 322 | 324 | 'username' => $wgUser->isAnon() ? NULL : $wgUser->getName(), |
| 323 | 325 | 'userlang' => $wgLang->getCode(), |