Commit 1a5f3010 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#188498 by Rob Loach: user profile category names are stored and compared case...

#188498 by Rob Loach: user profile category names are stored and compared case insensitively, but the reserved category name check was not case insensitive
parent a989f6cd
......@@ -177,7 +177,7 @@ function profile_field_form_validate($form, &$form_state) {
if (!$form_state['values']['category']) {
form_set_error('category', t('You must enter a category.'));
}
if ($form_state['values']['category'] == 'account') {
if (strtolower($form_state['values']['category']) == 'account') {
form_set_error('category', t('The specified category name is reserved for use by Drupal.'));
}
$args1 = array($form_state['values']['title'], $form_state['values']['category']);
......
......@@ -2702,6 +2702,20 @@ function system_update_6037() {
return $ret;
}
/**
* Ensure that "Account" is not used as a Profile category.
*/
function system_update_6038() {
$ret = array();
if (db_table_exists('profile_fields')) {
$ret[] = update_sql('UPDATE {profile_fields} SET category = "Account settings" WHERE LOWER(category) = "account"');
if ($affectedrows = db_affected_rows()) {
drupal_set_message(t('There were @affectedrows profile fields that used a reserved category name. They have been assigned to the category "Account settings".', array('@affectedrows' => $affectedrows)));
}
}
return $ret;
}
/**
* @} End of "defgroup updates-5.x-to-6.x"
* The next series of updates should start at 7000.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment