[designguru]

Originally Posted by aim

It seems you have customized admin/configuration.php file.


Some of these hunks cannot be applied

     'xpc_private_key',
     'xpc_public_key',
     'breadcrumbs_separator',
+    'company_mail_from',
+    'newsletter_email',
+    'orders_department',
+    'site_administrator',
+    'smtp_mail_from',
+    'support_department',
+    'users_department',
 );

 define('XC_SKIP_BOUNCER_TEST',1);

                     // Check email
                     $validation_result = $is_empty || func_check_email($val);

+                } elseif ($var_properties[$key]['validation'] == 'email_extended') {
+                    // Check email via XCEmailFormat::EXTENDED
+                    $validation_result = $is_empty || func_check_email($val, XCEmailFormat::EXTENDED);
                 } elseif ($var_properties[$key]['validation'] == 'emails') {

                     // Check emails list

 $smarty->assign('option',        $option);
 $smarty->assign('option_title',  $_option_title);
 $smarty->assign('main',          'configuration');
+$smarty->assign('email_extended_validation_regexp', func_email_validation_regexp(XCEmailFormat::EXTENDED));

 if (!empty($_option_title))
     $location[] = array( $_option_title, '');

Sent you PM