summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle Sebreghts2013-03-23 09:20:42 (GMT)
committer Jelle Sebreghts2013-03-23 09:20:42 (GMT)
commit57b50a1cd4ebe0f3c6768cc63e84d3c03ec04d26 (patch)
tree66cd7712a331a707bd4574d57d691827be0e6e31
parentca7ecc405b48bb482f1177f9b0ac5ea02cdaf743 (diff)
fix if condition
-rw-r--r--clientside_validation.admin.inc6
-rw-r--r--clientside_validation.module2
2 files changed, 4 insertions, 4 deletions
diff --git a/clientside_validation.admin.inc b/clientside_validation.admin.inc
index 375b431..4203167 100644
--- a/clientside_validation.admin.inc
+++ b/clientside_validation.admin.inc
@@ -12,7 +12,7 @@ function _clientside_validation_deprecated_admin_message() {
function clientside_validation_general_settings_form($form_id, $form_state) {
drupal_set_title(t('Edit general settings'));
- if (!module_exists('libraries') || ($library = libraries_detect('jquery.validate') && !empty($library['installed']))) {
+ if (module_exists('libraries') && $library = libraries_detect('jquery.validate') && !empty($library['installed'])) {
_clientside_validation_deprecated_admin_message();
}
//jquery.validate.js settings
@@ -168,7 +168,7 @@ function clientside_validation_general_settings_form($form_id, $form_state) {
}
function clientside_validation_settings_form($form, $form_state, $cvs_formid = NULL, $cvs_type = 'default') {
- if (!module_exists('libraries') || ($library = libraries_detect('jquery.validate') && !empty($library['installed']))) {
+ if (module_exists('libraries') && $library = libraries_detect('jquery.validate') && !empty($library['installed'])) {
_clientside_validation_deprecated_admin_message();
}
$settings = clientside_validation_settings_load($cvs_type, $cvs_formid, TRUE);
@@ -561,7 +561,7 @@ function _cv_setting_status($status) {
}
function clientside_validation_settings_overview($form, $form_state, $cvs_type) {
- if (!module_exists('libraries') || ($library = libraries_detect('jquery.validate') && !empty($library['installed']))) {
+ if (module_exists('libraries') && $library = libraries_detect('jquery.validate') && !empty($library['installed'])) {
_clientside_validation_deprecated_admin_message();
}
$form = array();
diff --git a/clientside_validation.module b/clientside_validation.module
index c1f4b12..6459225 100644
--- a/clientside_validation.module
+++ b/clientside_validation.module
@@ -409,7 +409,7 @@ function clientside_validation_webform_after_build(&$form, &$form_state) {
function clientside_validation_add_js_settings($settings) {
$clientside_validation_settings = &drupal_static('clientside_validation_settings', array());
- if (!module_exists('libraries') || ($library = libraries_detect('jquery.validate') && !empty($library['installed']))) {
+ if (module_exists('libraries') && $library = libraries_detect('jquery.validate') && !empty($library['installed'])) {
if (variable_get('clientside_validation_use_minified', 0) == 0) {
libraries_load('jquery.validate');
}