Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1939096 by chrisjlee, joelpittet, drupalmonkey | Cottser: Convert theme_feed_icon() to Twig.

8.0.x
webchick 2013-08-30 23:41:29 -07:00
parent af711e6082
commit bbf70b0c96
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/includes/theme.inc
View File

@ -2295,19 +2295,28 @@ function theme_item_list($variables) {
} }
/** /**
* Returns HTML for a feed icon. * Prepares variables for feed icon templates.
* *
* @param $variables * Default template: feed-icon.html.twig.
*
* @param array $variables
* An associative array containing: * An associative array containing:
* - url: An internal system path or a fully qualified external URL of the * - url: An internal system path or a fully qualified external URL of the
* feed. * feed.
* - title: A descriptive title of the feed. * - title: A descriptive title of the feed.
*/ */
function theme_feed_icon($variables) { function template_preprocess_feed_icon(&$variables) {
$text = t('Subscribe to !feed-title', array('!feed-title' => $variables['title'])); $text = t('Subscribe to !feed-title', array('!feed-title' => $variables['title']));
if ($image = theme('image', array('uri' => 'core/misc/feed.png', 'width' => 16, 'height' => 16, 'alt' => $text))) { $variables['icon'] = array(
return l($image, $variables['url'], array('html' => TRUE, 'attributes' => array('class' => array('feed-icon'), 'title' => $text))); '#theme' => 'image__feed_icon',
} '#uri' => 'core/misc/feed.png',
'#width' => 16,
'#height' => 16,
'#alt' => $text,
);
$variables['attributes']['class'] = array('feed-icon');
// Stripping tags because that's what l() used to do.
$variables['attributes']['title'] = strip_tags($text);
} }
/** /**
@ -3064,6 +3073,7 @@ function drupal_common_theme() {
), ),
'feed_icon' => array( 'feed_icon' => array(
'variables' => array('url' => NULL, 'title' => NULL), 'variables' => array('url' => NULL, 'title' => NULL),
'template' => 'feed-icon',
), ),
'more_link' => array( 'more_link' => array(
'variables' => array('url' => NULL, 'title' => NULL) 'variables' => array('url' => NULL, 'title' => NULL)

12
core/modules/system/lib/Drupal/system/Tests/Common/AddFeedTest.php
View File

@ -96,11 +96,13 @@ class AddFeedTest extends WebTestBase {
* @see http://drupal.org/node/1211668 * @see http://drupal.org/node/1211668
*/ */
function testFeedIconEscaping() { function testFeedIconEscaping() {
$variables = array(); $variables = array(
$variables['url'] = 'node'; '#theme' => 'feed_icon',
$variables['title'] = '<>&"\''; '#url' => 'node',
$text = theme_feed_icon($variables); '#title' => '<>&"\'',
);
$text = drupal_render($variables);
preg_match('/title="(.*?)"/', $text, $matches); preg_match('/title="(.*?)"/', $text, $matches);
$this->assertEqual($matches[1], 'Subscribe to &amp;&quot;&#039;', 'theme_feed_icon() escapes reserved HTML characters.'); $this->assertEqual($matches[1], 'Subscribe to &amp;&quot;&#039;', 'feed_icon template escapes reserved HTML characters.');
} }
} }

18
core/modules/system/templates/feed-icon.html.twig Normal file
View File

@ -0,0 +1,18 @@
{#
/**
* @file
* Default theme implementation for a feed icon.
*
* Available variables:
* - url: An internal system path or a fully qualified external URL of the feed.
* - icon: The rendered HTML (<img> tag) for the feed icon image.
* - attributes: Remaining HTML attributes for the feed link.
* - title: A descriptive title of the feed link.
* - class: HTML classes to be applied to the feed link.
*
* @see template_preprocess_feed_icon()
*
* @ingroup themeable
*/
#}
<a href="{{ url }}"{{ attributes }}>{{ icon }}</a>