Commit 10deab52 authored by jelles's avatar jelles
Browse files

Fixed minor bugs

parent 939a8412
......@@ -300,7 +300,7 @@ function clientside_validation_settings_form($form, $form_state, $cvs_formid = N
'0' => t('No'),
),
'#title' => t('Validate before AJAX calls'),
'#description' => t('Validate elements before ajax calls. Use with caution, this behavior has been known to !cause_issues.', l(t('cause issues'), 'https://drupal.org/project/issues/clientside_validation?text=4bf5b2d&status=All')),
'#description' => t('Validate elements before ajax calls. Use with caution, this behavior has been known to !cause_issues.', array('!cause_issues' => l(t('cause issues'), 'https://drupal.org/project/issues/clientside_validation?text=4bf5b2d&status=All'))),
'#default_value' => $settings['validate_options']['validate_before_ajax'],
);
......
......@@ -1478,7 +1478,7 @@ function clientside_validation_settings_current_form($settings = NULL) {
}
function clientside_validation_settings_load_defaults() {
static $defaults;
static $defaults = FALSE;
if (!$defaults) {
$defaults = clientside_validation_settings_load('default');
}
......@@ -1516,7 +1516,7 @@ function clientside_validation_settings_load($cvs_type = NULL, $cvs_formid = NUL
),
);
if ($cvs_type == 'default') {
return variable_get('clientside_validation_default_settings', $default_settings);
return drupal_array_merge_deep($default_settings, variable_get('clientside_validation_default_settings', $default_settings));
}
if (!db_table_exists('clientside_validation_settings')) {
drupal_set_message(
......
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