From 03acc37723f0aee180fff3fe21fb71e1fc2c1462 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 2 Jan 2014 10:28:02 -0800 Subject: [PATCH] Stop using the unholy trinity in DatabaseError RequestContext::getMain() shifts the blame, but at least it's one less place in core. Change-Id: I36ffad0ff2703c3326690eef2c07ef66aa532210 --- includes/db/DatabaseError.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php index 8be8530c6b..a314605bd8 100644 --- a/includes/db/DatabaseError.php +++ b/includes/db/DatabaseError.php @@ -270,21 +270,21 @@ EOT; * @return string */ private function fileCachedPage() { - global $wgTitle, $wgOut, $wgRequest; + $context = RequestContext::getMain(); - if ( $wgOut->isDisabled() ) { + if ( $context->getOutput()->isDisabled() ) { // Done already? return ''; } - if ( $wgTitle ) { - // use $wgTitle if we managed to set it - $t = $wgTitle->getPrefixedDBkey(); + if ( $context->getTitle() ) { + // Use the main context's title if we managed to set it + $t = $context->getTitle()->getPrefixedDBkey(); } else { // Fallback to the raw title URL param. We can't use the Title // class is it may hit the interwiki table and give a DB error. // We may get a cache miss due to not sanitizing the title though. - $t = str_replace( ' ', '_', $wgRequest->getVal( 'title' ) ); + $t = str_replace( ' ', '_', $context->getRequest()->getVal( 'title' ) ); if ( $t == '' ) { // fallback to main page $t = Title::newFromText( $this->msg( 'mainpage', 'Main Page' ) )->getPrefixedDBkey(); -- 2.20.1