Merge changes I551c5b5a,Ibaa277b5

* changes:
  Fix phpdoc
  Remove outdated comment
This commit is contained in:
jenkins-bot 2013-10-27 08:09:22 +00:00 committed by Gerrit Code Review
commit cb791abf09

View file

@ -19,7 +19,6 @@ class ThanksHooks {
// Make sure Echo is turned on.
// Exclude anonymous users.
// Don't let users thank themselves.
// Exclude users who don't want to participate in feature experiments.
// Exclude users who are blocked.
if ( class_exists( 'EchoNotifier' )
&& !$wgUser->isAnon()
@ -97,7 +96,7 @@ class ThanksHooks {
/**
* Handler for DiffViewHeader hook.
* @see http://www.mediawiki.org/wiki/Manual:Hooks/DiffViewHeader
* @param $diff WikiPage|Article|ImagePage|CategoryPage|Page The page that the history is loading for.
* @param $diff DifferenceEngine
* @param $oldRev Revision object of the "old" revision (may be null/invalid)
* @param $newRev Revision object of the "new" revision
* @return bool true in all cases