diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block/block.module | 2 | ||||
| -rw-r--r-- | modules/filter/filter.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/profile/profile.test | 4 | ||||
| -rw-r--r-- | modules/simpletest/tests/common.test | 28 |
5 files changed, 19 insertions, 19 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index 00b85cb07..2e84ab94b 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -823,7 +823,7 @@ function template_preprocess_block(&$variables) { // Create the $content variable that templates expect. $variables['content'] = $variables['elements']['#children']; - $variables['classes_array'][] = drupal_css_class('block-' . $variables['block']->module); + $variables['classes_array'][] = drupal_html_class('block-' . $variables['block']->module); $variables['template_files'][] = 'block-' . $variables['block']->region; $variables['template_files'][] = 'block-' . $variables['block']->module; diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 142482731..b5da0aa66 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -746,7 +746,7 @@ function filter_form($selected_format = NULL, $weight = NULL, $parents = array(' drupal_add_js('misc/form.js'); drupal_add_css(drupal_get_path('module', 'filter') . '/filter.css'); - $element_id = drupal_css_id('edit-' . implode('-', $parents)); + $element_id = drupal_html_id('edit-' . implode('-', $parents)); $form = array( '#type' => 'fieldset', diff --git a/modules/node/node.module b/modules/node/node.module index 20187b30b..c0cf14b68 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1195,7 +1195,7 @@ function template_preprocess_node(&$variables) { } // Gather node classes. - $variables['classes_array'][] = drupal_css_class('node-' . $node->type); + $variables['classes_array'][] = drupal_html_class('node-' . $node->type); if ($variables['promote']) { $variables['classes_array'][] = 'node-promoted'; } diff --git a/modules/profile/profile.test b/modules/profile/profile.test index 507d5ebd3..4ea8ee51a 100644 --- a/modules/profile/profile.test +++ b/modules/profile/profile.test @@ -266,8 +266,8 @@ class ProfileTestAutocomplete extends ProfileTestCase { $this->setProfileField($field, $field['value']); // Set some html for what we want to see in the page output later. - $autocomplete_html = '<input class="autocomplete" type="hidden" id="' . drupal_css_id('edit-' . $field['form_name'] . '-autocomplete') . '" value="' . url('profile/autocomplete/' . $field['fid'], array('absolute' => TRUE)) . '" disabled="disabled" />'; - $field_html = '<input type="text" maxlength="255" name="' . $field['form_name'] . '" id="' . drupal_css_id('edit-' . $field['form_name']) . '" size="60" value="' . $field['value'] . '" class="form-text form-autocomplete required" />'; + $autocomplete_html = '<input class="autocomplete" type="hidden" id="' . drupal_html_id('edit-' . $field['form_name'] . '-autocomplete') . '" value="' . url('profile/autocomplete/' . $field['fid'], array('absolute' => TRUE)) . '" disabled="disabled" />'; + $field_html = '<input type="text" maxlength="255" name="' . $field['form_name'] . '" id="' . drupal_html_id('edit-' . $field['form_name']) . '" size="60" value="' . $field['value'] . '" class="form-text form-autocomplete required" />'; // Check that autocompletion html is found on the user's profile edit page. $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category); diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index 72f92820d..e7b5af694 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -579,49 +579,49 @@ class DrupalCSSIdentifierTestCase extends DrupalUnitTestCase { public static function getInfo() { return array( 'name' => 'CSS identifiers', - 'description' => 'Test the functions drupal_css_class() and drupal_css_id() for expected behavior', + 'description' => 'Test the functions drupal_html_class() and drupal_html_id() for expected behavior', 'group' => 'System', ); } /** - * Tests that drupal_css_class() cleans the class name properly. + * Tests that drupal_html_class() cleans the class name properly. */ function testDrupalCleanCSSIdentifier() { // Verify that no valid ASCII characters are stripped from the class name. $class = 'abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789'; - $this->assertIdentical(drupal_clean_css_identifier($class, array()), $class, t('Verify valid ASCII characters pass through.')); + $this->assertIdentical(drupal_clean_html_identifier($class, array()), $class, t('Verify valid ASCII characters pass through.')); // Verify that no valid UTF-8 characters are stripped from the class name. $class = '¡¢£¤¥'; - $this->assertIdentical(drupal_clean_css_identifier($class, array()), $class, t('Verify valid UTF-8 characters pass through.')); + $this->assertIdentical(drupal_clean_html_identifier($class, array()), $class, t('Verify valid UTF-8 characters pass through.')); // Verify that invalid characters (including non-breaking space) are stripped from the class name. - $this->assertIdentical(drupal_clean_css_identifier('invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ class', array()), 'invalidclass', t('Strip invalid characters.')); + $this->assertIdentical(drupal_clean_html_identifier('invalid !"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ class', array()), 'invalidclass', t('Strip invalid characters.')); } /** - * Tests that drupal_css_class() cleans the class name properly. + * Tests that drupal_html_class() cleans the class name properly. */ function testDrupalCSSClass() { // Verify Drupal coding standards are enforced. - $this->assertIdentical(drupal_css_class('CLASS NAME_[Ü]'), 'class-name--ü', t('Enforce Drupal coding standards.')); + $this->assertIdentical(drupal_html_class('CLASS NAME_[Ü]'), 'class-name--ü', t('Enforce Drupal coding standards.')); } /** - * Tests that drupal_css_id() cleans the id name properly. + * Tests that drupal_html_id() cleans the id name properly. */ function testDrupalCSSId() { // Verify Drupal coding standards are enforced. - $this->assertIdentical(drupal_css_id('ID NAME_[Ü]'), 'id-name--ü', t('Enforce Drupal coding standards.')); + $this->assertIdentical(drupal_html_id('ID NAME_[Ü]'), 'id-name--ü', t('Enforce Drupal coding standards.')); // Reset the static cache so we can ensure the unique id count is at zero. - drupal_static_reset('drupal_css_id'); + drupal_static_reset('drupal_html_id'); // Clean up IDs with invalid starting characters. - $this->assertIdentical(drupal_css_id('test-unique-id'), 'test-unique-id', t('Test the uniqueness of IDs #1.')); - $this->assertIdentical(drupal_css_id('test-unique-id'), 'test-unique-id-2', t('Test the uniqueness of IDs #2.')); - $this->assertIdentical(drupal_css_id('test-unique-id'), 'test-unique-id-3', t('Test the uniqueness of IDs #3.')); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id', t('Test the uniqueness of IDs #1.')); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id-2', t('Test the uniqueness of IDs #2.')); + $this->assertIdentical(drupal_html_id('test-unique-id'), 'test-unique-id-3', t('Test the uniqueness of IDs #3.')); } } @@ -1498,7 +1498,7 @@ class DrupalAttributesUnitTest extends DrupalUnitTestCase { } /** - * Tests that drupal_css_class() cleans the class name properly. + * Tests that drupal_html_class() cleans the class name properly. */ function testDrupalAttributes() { // Verify that special characters are HTML encoded. |