From c6e31be9c5e585df85670e5c6c597542d69707a6 Mon Sep 17 00:00:00 2001
From: josebc <jose_bc@live.co.uk>
Date: Wed, 23 Jul 2014 18:50:48 +0300
Subject: [PATCH] Issue 2308385: fixing missing css class

---
 cck_phone.module |   32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/cck_phone.module b/cck_phone.module
index 3208d7b..f8397ac 100644
--- a/cck_phone.module
+++ b/cck_phone.module
@@ -494,14 +494,19 @@ function _cck_phone_validate(&$item, $delta, $field, $instance, $langcode, &$err
       if ($settings['enable_extension'] && $ext_input != '') {
         $error .= '<br />' . t('The phone extension must be less than %ext_max_length digits in length.', $error_params);
       }
-
-      form_set_error($field['field_name'], $error);
+      $errors[$field['field_name']][$langcode][$delta][] = array(
+        'error' => "phone_invalid",
+        'message' => $error,
+      );
     }
     else {
       if (!$settings['all_country_codes']) {
         if (!_cck_phone_valid_cc_input($settings['country_codes']['country_selection'], $countrycode)) {
           $error = t('Invalid country code "%countrycode" submitted.', $error_params);
-          form_set_error($field['field_name'], $error);
+          $errors[$field['field_name']][$langcode][$delta][] = array(
+            'error' => "phone_invalid",
+            'message' => $error,
+          );
         }
       }
       // Generic number validation
@@ -510,8 +515,10 @@ function _cck_phone_validate(&$item, $delta, $field, $instance, $langcode, &$err
         if ($field['enable_extension'] && $ext_input != '') {
           $error .= '<br />' . t('The phone extension must be less than %ext_max_length digits in length.', $error_params);
         }
-
-        form_set_error($field['field_name'], $error);
+        $errors[$field['field_name']][$langcode][$delta][] = array(
+          'error' => "phone_invalid",
+          'message' => $error,
+        );
       }
       // Country level validation if enabled
       elseif ($settings['enable_country_level_validation']) {
@@ -523,7 +530,10 @@ function _cck_phone_validate(&$item, $delta, $field, $instance, $langcode, &$err
           if (function_exists($validate_function)) {
             $error = '';
             if (!$validate_function($phone_input, $ext_input, $error)) {
-              form_set_error($field['field_name'], t($error, $error_params));
+              $errors[$field['field_name']][$langcode][$delta][] = array(
+                'error' => "phone_invalid",
+                'message' => $error,
+              );
             }
           }
         }
@@ -827,7 +837,7 @@ function cck_phone_phone_number_validate(&$element, &$form_state) {
 
   if (isset($phone_input) && !empty($phone_input)) {
     if (empty($countrycode)) {
-      form_set_error($field['field_name'], t('The phone number must be accompanied by a country code.'));
+      form_error($element, t('The phone number must be accompanied by a country code.'));
     }
     else {
       $error_params = array(
@@ -846,13 +856,13 @@ function cck_phone_phone_number_validate(&$element, &$form_state) {
           $error .= '<br />' . t('The phone extension must be less than %ext_max_length digits in length.', $error_params);
         }
 
-        form_set_error($field['field_name'], $error);
+        form_error($element, $error);
       }
       else {
         if (!$settings['all_country_codes']) {
           if (!_cck_phone_valid_cc_input($settings['country_codes']['country_selection'], $countrycode)) {
             $error = t('Invalid country code "%countrycode" submitted.', $error_params);
-            form_set_error($field['field_name'], $error);
+            form_error($element, $error);
           }
         }
         // Generic number validation
@@ -862,7 +872,7 @@ function cck_phone_phone_number_validate(&$element, &$form_state) {
             $error .= '<br />' . t('The phone extension must be less than %ext_max_length digits in length.', $error_params);
           }
 
-          form_set_error($field['field_name'], $error);
+          form_error($element, $error);
         }
         // Country level validation if enabled
         elseif ($settings['enable_country_level_validation']) {
@@ -874,7 +884,7 @@ function cck_phone_phone_number_validate(&$element, &$form_state) {
             if (function_exists($validate_function)) {
               $error = '';
               if (!$validate_function($phone_input, $ext_input, $error)) {
-                form_set_error($field['field_name'], t($error, $error_params));
+                form_error($element, t($error, $error_params));
               }
             }
           }
-- 
1.7.9.5