commit 3d9ccf0d9c1e82f1fcc72b68981810f21ce3d0fb Author: Joel Pittet Date: Thu Feb 6 09:04:50 2014 -0800 doc changes diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 55151e8..005dd65 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1195,13 +1195,12 @@ function template_preprocess_status_messages(&$variables) { * l() as its $options parameter. * - attributes: A keyed array of attributes for the UL containing the * list of links. - * - set_active_class: (optional) Whether theme_links() should compare the + * - set_active_class: (optional) Whether each link should compare the * route_name + route_parameters or href (path), language and query options - * to the current URL for each of the links, to determine whether the link - * is "active". If so, an "active" class will be applied to the list item - * containing the link, as well as the link itself. It is important to use - * this sparingly since it is usually unnecessary and requires extra - * processing. + * to the current URL, to determine whether the link is "active". If so, an + * "active" class will be applied to the list item containing the link, as + * well as the link itself. It is important to use this sparingly since it + * is usually unnecessary and requires extra processing. * For anonymous users, the "active" class will be calculated on the server, * because most sites serve each anonymous user the same cached page anyway. * For authenticated users, the "active" class will be calculated on the @@ -1224,8 +1223,8 @@ function template_preprocess_status_messages(&$variables) { * http://juicystudio.com/article/screen-readers-display-none.php and * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information. * - * theme_links() unfortunately duplicates the "active" class handling of l() and - * LinkGenerator::generate() because it needs to be able to set the "active" + * Unfortunately links templates duplicate the "active" class handling of l() + * and LinkGenerator::generate() because it needs to be able to set the "active" * class not on the links themselves ("a" tags), but on the list items ("li" * tags) that contain the links. This is necessary for CSS to be able to style * list items differently when the link is active, since CSS does not yet allow diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 941ef47..065d280 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2359,7 +2359,7 @@ function system_page_build(&$page) { // - applying a post-render cache callback if the current user is anonymous. // @see l() // @see \Drupal\Core\Utility\LinkGenerator::generate() - // @see theme_links() + // @see template_preprocess_links() // @see \Drupal\system\Controller\SystemController::setLinkActiveClass if (\Drupal::currentUser()->isAuthenticated()) { $page['#attached']['library'][] = array('system', 'drupal.active-link'); diff --git a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/Controller/AjaxTestController.php b/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/Controller/AjaxTestController.php index 663908c..ac0399f 100644 --- a/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/Controller/AjaxTestController.php +++ b/core/modules/system/tests/modules/ajax_test/lib/Drupal/ajax_test/Controller/AjaxTestController.php @@ -63,7 +63,7 @@ public function dialog() { ), ); - // Dialog behavior applied to links rendered by theme_links(). + // Dialog behavior applied to links rendered by links.html.twig. $build['links'] = array( '#theme' => 'links', '#links' => array(