aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2012-06-05 20:24:58 +0000
committerGerrit Code Review <gerrit@wikimedia.org>2012-06-05 20:24:58 +0000
commit612185643ccf6fcb00642e79eeb9f40092b36961 (patch)
treec7979673418221159211a9ac875eb39ae485fa4c /includes
parentaba5b4c583dcc739d6588c9ce43c7e2560bcdc8d (diff)
parentc42131dd8ed052cabf78875a374ffc351f1fea38 (diff)
downloadmediawikicore-612185643ccf6fcb00642e79eeb9f40092b36961.tar.gz
mediawikicore-612185643ccf6fcb00642e79eeb9f40092b36961.zip
Merge "(bug 32643) Prevent action=purge&forcelinkupdate crash"
Diffstat (limited to 'includes')
-rw-r--r--includes/api/ApiPurge.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index 8ef9cbc0e3a9..8e9c198fbb11 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -104,7 +104,8 @@ class ApiPurge extends ApiBase {
$pcache->save( $p_result, $page, $popts );
}
} else {
- $this->setWarning( $this->parseMsg( array( 'actionthrottledtext' ) ) );
+ $error = $this->parseMsg( array( 'actionthrottledtext' ) );
+ $this->setWarning( $error['info'] );
$forceLinkUpdate = false;
}
}