From: Victor Vasiliev <vasilvv@gmail.com>
Date: Sun, 20 Jan 2013 00:46:26 +0000 (-0500)
Subject: (bug 43751) Allow '+' in MySQL database names.
X-Git-Tag: 1.31.0-rc.0~20909
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=676bea0ec68039bcd45c753ca3a89d736e67ed47;p=lhc%2Fweb%2Fwiklou.git

(bug 43751) Allow '+' in MySQL database names.

Change-Id: I0196af1989a09d941bfcc8e52c6c9f97ea5abe95
---

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index f66f15f24e..94c38c4c66 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -107,7 +107,7 @@ class MysqlInstaller extends DatabaseInstaller {
 		}
 		if ( !strlen( $newValues['wgDBname'] ) ) {
 			$status->fatal( 'config-missing-db-name' );
-		} elseif ( !preg_match( '/^[a-z0-9_-]+$/i', $newValues['wgDBname'] ) ) {
+		} elseif ( !preg_match( '/^[a-z0-9+_-]+$/i', $newValues['wgDBname'] ) ) {
 			$status->fatal( 'config-invalid-db-name', $newValues['wgDBname'] );
 		}
 		if ( !preg_match( '/^[a-z0-9_-]*$/i', $newValues['wgDBprefix'] ) ) {