diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-08 12:43:41 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-08 12:43:41 +0000 |
commit | 031a6876495a74326cd69b660333ab35450cf705 (patch) | |
tree | 9c224e3451fa06f4d8bfef932c5e06378afea109 /includes | |
parent | 15d972d1618cf47852399f81ae5bb4010de85333 (diff) | |
download | brdo-031a6876495a74326cd69b660333ab35450cf705.tar.gz brdo-031a6876495a74326cd69b660333ab35450cf705.tar.bz2 |
#318636 by effulgentsia, sun, Damien Tournoud, Xano, and jrchamp: Make l() themable.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 33 | ||||
-rw-r--r-- | includes/theme.inc | 25 |
2 files changed, 58 insertions, 0 deletions
diff --git a/includes/common.inc b/includes/common.inc index 75b369954..310bfebcd 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -2683,6 +2683,7 @@ function drupal_attributes(array $attributes = array()) { */ function l($text, $path, array $options = array()) { global $language_url; + static $use_theme = NULL; // Merge in defaults. $options += array( @@ -2702,6 +2703,35 @@ function l($text, $path, array $options = array()) { $options['attributes']['title'] = strip_tags($options['attributes']['title']); } + // Determine if rendering of the link is to be done with a theme function + // or the inline default. Inline is faster, but if the theme system has been + // loaded and a module or theme implements a preprocess or process function + // or overrides the theme_link() function, then invoke theme(). Preliminary + // benchmarks indicate that invoking theme() can slow down the l() function + // by 20% or more, and that some of the link-heavy Drupal pages spend more + // than 10% of the total page request time in the l() function. + if (!isset($use_theme) && function_exists('theme')) { + // Allow edge cases to prevent theme initialization and force inline link + // rendering. + if (variable_get('theme_link', TRUE)) { + drupal_theme_initialize(); + $registry = theme_get_registry(); + // We don't want to duplicate functionality that's in theme(), so any + // hint of a module or theme doing anything at all special with the 'link' + // theme hook should simply result in theme() being called. This includes + // the overriding of theme_link() with an alternate function or template, + // the presence of preprocess or process functions, or the presence of + // include files. + $use_theme = !isset($registry['link']['function']) || ($registry['link']['function'] != 'theme_link'); + $use_theme = $use_theme || !empty($registry['link']['preprocess functions']) || !empty($registry['link']['process functions']) || !empty($registry['link']['includes']); + } + else { + $use_theme = FALSE; + } + } + if ($use_theme) { + return theme('link', array('text' => $text, 'path' => $path, 'options' => $options)); + } return '<a href="' . check_plain(url($path, $options)) . '"' . drupal_attributes($options['attributes']) . '>' . ($options['html'] ? $text : check_plain($text)) . '</a>'; } @@ -5348,6 +5378,9 @@ function drupal_common_theme() { 'status_messages' => array( 'variables' => array('display' => NULL), ), + 'link' => array( + 'variables' => array('text' => NULL, 'path' => NULL, 'options' => array()), + ), 'links' => array( 'variables' => array('links' => NULL, 'attributes' => array('class' => array('links')), 'heading' => array()), ), diff --git a/includes/theme.inc b/includes/theme.inc index ebe3e6610..9cb913e14 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1370,6 +1370,31 @@ function theme_status_messages($variables) { } /** + * Return a themed link. + * + * All Drupal code that outputs a link should call the l() function. That + * function performs some initial preprocessing, and then, if necessary, + * calls theme('link') for rendering the anchor tag. + * + * To optimize performance for sites that don't need custom theming of links, + * the l() function includes an inline copy of this function, and uses that copy + * if none of the enabled modules or the active theme implement any preprocess + * or process functions or override this theme implementation. + * + * @param $variables + * An associative array containing the keys 'text', 'path', and 'options'. + * See the l() function for information about these variables. + * + * @return + * An HTML string containing a link to the given path. + * + * @see l() + */ +function theme_link($variables) { + return '<a href="' . check_plain(url($variables['path'], $variables['options'])) . '"' . drupal_attributes($variables['options']['attributes']) . '>' . ($variables['options']['html'] ? $variables['text'] : check_plain($variables['text'])) . '</a>'; +} + +/** * Return a themed set of links. * * @param $variables |