From 842d49595fa38608a0dd6a630dd4e34f404cf688 Mon Sep 17 00:00:00 2001 From: Carwin Young Date: Thu, 9 May 2013 14:51:38 -0500 Subject: [PATCH] Issue 1111258: Allow underscores in CSS class names. --- plugins/views_plugin_display.inc | 4 ++-- plugins/views_plugin_style.inc | 2 +- theme/theme.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc index 75a32c5..5f3bb49 100644 --- a/plugins/views_plugin_display.inc +++ b/plugins/views_plugin_display.inc @@ -2209,8 +2209,8 @@ class views_plugin_display extends views_plugin { break; case 'css_class': $css_class = $form_state['values']['css_class']; - if (preg_match('/[^a-zA-Z0-9-_ ]/', $css_class)) { - form_error($form['css_class'], t('CSS classes must be alphanumeric or dashes only.')); + if (preg_match('/[^[:alnum:]-_]/', $css_class)) { + form_error($form['css_class'], t('CSS classes must be alphanumeric, dashes, or underscores only.')); } break; case 'display_id': diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc index d355e1b..99594bc 100644 --- a/plugins/views_plugin_style.inc +++ b/plugins/views_plugin_style.inc @@ -129,7 +129,7 @@ class views_plugin_style extends views_plugin { $classes = explode(' ', $class); foreach ($classes as &$class) { - $class = drupal_clean_css_identifier($class); + $class = views_clean_css_identifier($class); } return implode(' ', $classes); } diff --git a/theme/theme.inc b/theme/theme.inc index e7f7a15..ef923a3 100644 --- a/theme/theme.inc +++ b/theme/theme.inc @@ -63,7 +63,7 @@ function template_preprocess_views_view(&$vars) { $css_class = $view->display_handler->get_option('css_class'); if (!empty($css_class)) { - $vars['css_class'] = preg_replace('/[^a-zA-Z0-9- ]/', '-', $css_class); + $vars['css_class'] = preg_replace('/[^[:alnum:]_]/', '-', $css_class); $vars['classes_array'][] = $vars['css_class']; } -- 1.8.2