Changeset 41336

Timestamp:

09/04/2017 07:37:37 PM (8 years ago)

Author:

ocean90

Message:

I18N: Allow numbers in locales during installation.

The current regex was a bit to strict for locales like pt_PT_ao90 which were already supported by wp_get_installed_translations().

Merge of [41335] to the 4.8 branch.

See #41794.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-admin/install.php (modified) (1 diff)
• src/wp-admin/setup-config.php (modified) (1 diff)

branches/4.8/src/wp-admin/install.php

@@ -280 +280 @@
 $language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
-    $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+    $language = preg_replace( '/[^a-zA-Z0-9_]/', '', $_REQUEST['language'] );
 } elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
     $language = $GLOBALS['wp_local_package'];

branches/4.8/src/wp-admin/setup-config.php

@@ -106 +106 @@
 $language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
-    $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+    $language = preg_replace( '/[^a-zA-Z0-9_]/', '', $_REQUEST['language'] );
 } elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
     $language = $GLOBALS['wp_local_package'];