Projet

Général

Profil

Révision 134c7813

Ajouté par Mathieu Schiano Di Schiabica il y a environ 8 ans

Update to 7.43

Voir les différences:

drupal7/modules/user/user.module
1308 1308
    elseif (!empty($edit['picture_delete'])) {
1309 1309
      $edit['picture'] = NULL;
1310 1310
    }
1311
    // Prepare user roles.
1312
    if (isset($edit['roles'])) {
1313
      $edit['roles'] = array_filter($edit['roles']);
1314
    }
1311
  }
1312

  
1313
  // Filter out roles with empty values to avoid granting extra roles when
1314
  // processing custom form submissions.
1315
  if (isset($edit['roles'])) {
1316
    $edit['roles'] = array_filter($edit['roles']);
1315 1317
  }
1316 1318

  
1317 1319
  // Move account cancellation information into $user->data.
......
2227 2229
      }
2228 2230
    }
2229 2231
    else {
2230
      form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password', array('query' => array('name' => $form_state['values']['name']))))));
2232
      // Use $form_state['input']['name'] here to guarantee that we send
2233
      // exactly what the user typed in. $form_state['values']['name'] may have
2234
      // been modified by validation handlers that ran earlier than this one.
2235
      $query = isset($form_state['input']['name']) ? array('name' => $form_state['input']['name']) : array();
2236
      form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password', array('query' => $query)))));
2231 2237
      watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
2232 2238
    }
2233 2239
  }

Formats disponibles : Unified diff