dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove superfluous rules from print CSS"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialConfirmemail.php
diff --git
a/includes/specials/SpecialConfirmemail.php
b/includes/specials/SpecialConfirmemail.php
index
b6ab112
..
147f67e
100644
(file)
--- a/
includes/specials/SpecialConfirmemail.php
+++ b/
includes/specials/SpecialConfirmemail.php
@@
-43,6
+43,10
@@
class EmailConfirmation extends UnlistedSpecialPage {
* @throws UserNotLoggedIn
*/
function execute( $code ) {
* @throws UserNotLoggedIn
*/
function execute( $code ) {
+ // Ignore things like master queries/connections on GET requests.
+ // It's very convenient to just allow formless link usage.
+ Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
$this->setHeaders();
$this->checkReadOnly();
$this->setHeaders();
$this->checkReadOnly();
@@
-120,7
+124,7
@@
class EmailConfirmation extends UnlistedSpecialPage {
* @param string $code Confirmation code
*/
function attemptConfirm( $code ) {
* @param string $code Confirmation code
*/
function attemptConfirm( $code ) {
- $user = User::newFromConfirmationCode( $code );
+ $user = User::newFromConfirmationCode( $code
, User::READ_LATEST
);
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
@@
-151,6
+155,10
@@
class EmailInvalidation extends UnlistedSpecialPage {
}
function execute( $code ) {
}
function execute( $code ) {
+ // Ignore things like master queries/connections on GET requests.
+ // It's very convenient to just allow formless link usage.
+ Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
$this->setHeaders();
$this->checkReadOnly();
$this->checkPermissions();
$this->setHeaders();
$this->checkReadOnly();
$this->checkPermissions();
@@
-164,7
+172,7
@@
class EmailInvalidation extends UnlistedSpecialPage {
* @param string $code Confirmation code
*/
function attemptInvalidate( $code ) {
* @param string $code Confirmation code
*/
function attemptInvalidate( $code ) {
- $user = User::newFromConfirmationCode( $code );
+ $user = User::newFromConfirmationCode( $code
, User::READ_LATEST
);
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
if ( !is_object( $user ) ) {
$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );