From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 21 Sep 2016 19:50:34 +0000 (-0700)
Subject: Remove MediaWiki mentions from /rdbms error strings
X-Git-Tag: 1.31.0-rc.0~5389^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=aec9ad8ad7c1b7469ecb304d064f2c5407b6a396;p=lhc%2Fweb%2Fwiklou.git

Remove MediaWiki mentions from /rdbms error strings

Change-Id: Ia330d8e465641d04e5d22a24490d792913f1ccb8
---

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." );
 	}
 }