updated core
This commit is contained in:
@@ -5,7 +5,7 @@ version = VERSION
|
||||
core = 7.x
|
||||
hidden = TRUE
|
||||
|
||||
; Information added by Drupal.org packaging script on 2018-10-17
|
||||
version = "7.60"
|
||||
; Information added by Drupal.org packaging script on 2019-01-16
|
||||
version = "7.63"
|
||||
project = "drupal"
|
||||
datestamp = "1539816636"
|
||||
datestamp = "1547681965"
|
||||
|
@@ -9,7 +9,7 @@ required = TRUE
|
||||
configure = admin/config/people
|
||||
stylesheets[all][] = user.css
|
||||
|
||||
; Information added by Drupal.org packaging script on 2018-10-17
|
||||
version = "7.60"
|
||||
; Information added by Drupal.org packaging script on 2019-01-16
|
||||
version = "7.63"
|
||||
project = "drupal"
|
||||
datestamp = "1539816636"
|
||||
datestamp = "1547681965"
|
||||
|
@@ -637,7 +637,7 @@ function user_validate_name($name) {
|
||||
if (strpos($name, ' ') !== FALSE) {
|
||||
return t('The username cannot contain multiple spaces in a row.');
|
||||
}
|
||||
if (preg_match('/[^\x{80}-\x{F7} a-z0-9@_.\'-]/i', $name)) {
|
||||
if (preg_match('/[^\x{80}-\x{F7} a-z0-9@+_.\'-]/i', $name)) {
|
||||
return t('The username contains an illegal character.');
|
||||
}
|
||||
if (preg_match('/[\x{80}-\x{A0}' . // Non-printable ISO-8859-1 + NBSP
|
||||
@@ -689,7 +689,7 @@ function user_validate_picture(&$form, &$form_state) {
|
||||
$validators = array(
|
||||
'file_validate_is_image' => array(),
|
||||
'file_validate_image_resolution' => array(variable_get('user_picture_dimensions', '85x85')),
|
||||
'file_validate_size' => array(variable_get('user_picture_file_size', '30') * 1024),
|
||||
'file_validate_size' => array((int) variable_get('user_picture_file_size', '30') * 1024),
|
||||
);
|
||||
|
||||
// Save the file as a temporary file.
|
||||
|
@@ -276,6 +276,7 @@ class UserValidationTestCase extends DrupalWebTestCase {
|
||||
'foo@example.com' => array('Valid username', 'assertNull'),
|
||||
'foo@-example.com' => array('Valid username', 'assertNull'), // invalid domains are allowed in usernames
|
||||
'þòøÇߪř€' => array('Valid username', 'assertNull'),
|
||||
'foo+bar' => array('Valid username', 'assertNull'), // '+' symbol is allowed
|
||||
'ᚠᛇᚻ᛫ᛒᛦᚦ' => array('Valid UTF8 username', 'assertNull'), // runes
|
||||
' foo' => array('Invalid username that starts with a space', 'assertNotNull'),
|
||||
'foo ' => array('Invalid username that ends with a space', 'assertNotNull'),
|
||||
@@ -2386,7 +2387,13 @@ class UserUserSearchTestCase extends DrupalWebTestCase {
|
||||
}
|
||||
|
||||
function testUserSearch() {
|
||||
// Verify that a user without 'administer users' permission cannot search
|
||||
// for users by email address. Additionally, ensure that the username has a
|
||||
// plus sign to ensure searching works with that.
|
||||
$user1 = $this->drupalCreateUser(array('access user profiles', 'search content', 'use advanced search'));
|
||||
$edit['name'] = 'foo+bar';
|
||||
$edit['mail'] = $edit['name'] . '@example.com';
|
||||
user_save($user1, $edit);
|
||||
$this->drupalLogin($user1);
|
||||
$keys = $user1->mail;
|
||||
$edit = array('keys' => $keys);
|
||||
|
Reference in New Issue
Block a user