Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2231495 by ACF, andrei.dincu: Array to string conversion error when trying to add a new user.

8.0.x
Alex Pott 2014-04-16 00:37:05 +01:00
parent 068dd7138f
commit 562addafa0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/contact/contact.module
View File

@ -208,7 +208,9 @@ function contact_form_user_form_alter(&$form, &$form_state) {
'#weight' => 5, '#weight' => 5,
); );
$account = $form_state['controller']->getEntity(); $account = $form_state['controller']->getEntity();
$account_data = !\Drupal::currentUser()->isAnonymous() ? \Drupal::service('user.data')->get('contact', $account->id(), 'enabled') : NULL; if (!\Drupal::currentUser()->isAnonymous() && $account->id()) {
$account_data = \Drupal::service('user.data')->get('contact', $account->id(), 'enabled');
}
$form['contact']['contact'] = array( $form['contact']['contact'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Personal contact form'), '#title' => t('Personal contact form'),

2
core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php
View File

@ -19,7 +19,7 @@ class UserCreateTest extends WebTestBase {
* *
* @var array * @var array
*/ */
public static $modules = array('image'); public static $modules = array('image', 'contact');
public static function getInfo() { public static function getInfo() {
return array( return array(