jenkins-bot has submitted this change and it was merged.

Change subject: Remove MediaWiki mentions from /rdbms error strings
......................................................................


Remove MediaWiki mentions from /rdbms error strings

Change-Id: Ia330d8e465641d04e5d22a24490d792913f1ccb8
---
M includes/libs/rdbms/exception/DBError.php
1 file changed, 3 insertions(+), 5 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/rdbms/exception/DBError.php 
b/includes/libs/rdbms/exception/DBError.php
index 38887cf..544da5f 100644
--- a/includes/libs/rdbms/exception/DBError.php
+++ b/includes/libs/rdbms/exception/DBError.php
@@ -110,9 +110,8 @@
                                "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 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." );
        }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/312087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia330d8e465641d04e5d22a24490d792913f1ccb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to