commit acb5a0da88b6df7ba699123943a1e10fc65f37fc Author: Joel Pittet Date: Wed Jul 8 23:00:13 2015 -0700 nits diff --git a/core/lib/Drupal/Component/Utility/SafeMarkup.php b/core/lib/Drupal/Component/Utility/SafeMarkup.php index bc725c7..af9d840 100644 --- a/core/lib/Drupal/Component/Utility/SafeMarkup.php +++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php @@ -141,7 +141,7 @@ public static function escape($string) { /** * Applies a very permissive XSS/HTML filter for admin-only use. * - * Note: this method only filters if $string is not marked safe already. + * Note: This method only filters if $string is not marked safe already. * * @deprecated as of Drupal 8.0.x, will be removed before Drupal 8.0.0. If the * string used as part of a @link theme_render render array @endlink use diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php index 477f847..f0c78bb 100644 --- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php +++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php @@ -174,8 +174,8 @@ public static function preRenderConditionalComments($element) { // Ensure what we are dealing with is safe. // This would be done later anyway in drupal_render(). - $prefix = isset($elements['#prefix']) ? Xss::FilterAdmin($elements['#prefix']) : ''; - $suffix = isset($elements['#suffix']) ? Xss::FilterAdmin($elements['#suffix']) : ''; + $prefix = isset($elements['#prefix']) ? Xss::filterAdmin($elements['#prefix']) : ''; + $suffix = isset($elements['#suffix']) ? Xss::filterAdmin($elements['#suffix']) : ''; // Now calling SafeMarkup::set is safe, because we ensured the // data coming in was at least admin escaped. diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php index abd0a9b..503a26d 100644 --- a/core/lib/Drupal/Core/Render/Renderer.php +++ b/core/lib/Drupal/Core/Render/Renderer.php @@ -654,7 +654,7 @@ public function addCacheableDependency(array &$elements, $dependency) { /** * Applies a very permissive XSS/HTML filter for admin-only use. * - * Note: this method only filters if $string is not marked safe already. This + * Note: This method only filters if $string is not marked safe already. This * ensures that HTML intended for display is not filtered. * * @param string $string diff --git a/core/modules/block_content/block_content.pages.inc b/core/modules/block_content/block_content.pages.inc index 84b1a81..dbb614a 100644 --- a/core/modules/block_content/block_content.pages.inc +++ b/core/modules/block_content/block_content.pages.inc @@ -29,7 +29,7 @@ function template_preprocess_block_content_add_list(&$variables) { 'link' => \Drupal::l($type->label(), new Url('block_content.add_form', array('block_content_type' => $type->id()), array('query' => $query))), 'description' => array( // #markup is filtered for admin XSS automatically. - '#markup' => $type->getDescription() + '#markup' => $type->getDescription(), ), 'title' => $type->label(), 'localized_options' => array( diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 9c543c0..25acc43 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -356,7 +356,7 @@ function _filter_tips($format_id, $long = FALSE) { $tips[$format->label()][$name] = array( // #markup is filtered for admin XSS automatically. 'tip' => array('#markup' => $tip), - 'id' => $name + 'id' => $name, ); } }