WordPress.org

Make WordPress Core

Ticket #13839: patch.txt

File patch.txt, 847 bytes (added by anthonycole, 5 years ago)
Line 
1===================================================================
2--- setup-config.php    (revision 15361)
3+++ setup-config.php    (working copy)
4@@ -157,12 +157,10 @@
5        $passwrd = trim($_POST['pwd']);
6        $dbhost  = trim($_POST['dbhost']);
7        $prefix  = trim($_POST['prefix']);
8-       if ( empty($prefix) )
9-               $prefix = 'wp_';
10 
11        // Validate $prefix: it can only contain letters, numbers and underscores
12-       if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
13-               wp_die( /*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ );
14+       if ( preg_match( '|[^\'a-z0-9_]|i', $prefix ) )
15+               wp_die( /*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: "Table Prefix" can only be blank or contain numbers, letters, or underscores.'/*/WP_I18N_BAD_PREFIX*/ );
16 
17        // Test the db connection.
18        /**#@+