From aec9ad8ad7c1b7469ecb304d064f2c5407b6a396 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 21 Sep 2016 12:50:34 -0700 Subject: [PATCH] Remove MediaWiki mentions from /rdbms error strings Change-Id: Ia330d8e465641d04e5d22a24490d792913f1ccb8 --- includes/libs/rdbms/exception/DBError.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/libs/rdbms/exception/DBError.php b/includes/libs/rdbms/exception/DBError.php index 38887cfd71..544da5f1e9 100644 --- a/includes/libs/rdbms/exception/DBError.php +++ b/includes/libs/rdbms/exception/DBError.php @@ -110,9 +110,8 @@ class DBQueryError extends DBExpectedError { "Function: $fname\n" . "Error: $errno $error\n"; } else { - $message = "A database error has occurred. Did you forget to run " . - "maintenance/update.php after upgrading? See: " . - "https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . + $message = "A database query error has occurred. Did you forget to run " . + "your application's database schema updater after upgrading? \n" . "Query: $sql\n" . "Function: $fname\n" . "Error: $errno $error\n"; @@ -166,8 +165,7 @@ class DBUnexpectedError extends DBError { */ class DBAccessError extends DBUnexpectedError { public function __construct() { - parent::__construct( "Mediawiki tried to access the database via wfGetDB(). " . - "This is not allowed, because database access has been disabled." ); + parent::__construct( "Access to the database has been disabled." ); } } -- 2.20.1