diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2016-05-21 08:33:14 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2016-05-21 08:33:14 +0200 |
| commit | 7bf2eb8ba09b54cec804446ea39a3e658773fac9 (patch) | |
| tree | 12fa50d1d49fe0c7f9b5cff08aa88d93f5d4146f /includes/api/ApiBase.php | |
| parent | c96958a50a97382ef4ada897d1e7120d7a222a28 (diff) | |
Update to MediaWiki 1.26.3
Diffstat (limited to 'includes/api/ApiBase.php')
| -rw-r--r-- | includes/api/ApiBase.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index d53797bc..4f40499c 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -421,7 +421,13 @@ abstract class ApiBase extends ContextSource { * @return bool */ public function lacksSameOriginSecurity() { - return $this->getMain()->getRequest()->getVal( 'callback' ) !== null; + // Main module has this method overridden + // Safety - avoid infinite loop: + if ( $this->isMain() ) { + ApiBase::dieDebug( __METHOD__, 'base method was called on main module.' ); + } + + return $this->getMain()->lacksSameOriginSecurity(); } /** |