diff --git a/core/includes/pager.inc b/core/includes/pager.inc index d929bcc..c1f87c1 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -237,13 +237,13 @@ function theme_pager($variables) { if ($pager_total[$element] > 1) { if ($li_first) { $items[] = array( - '#li_attributes' => array('class' => array('pager-first')), + '#wrapper_attributes' => array('class' => array('pager-first')), '#markup' => $li_first, ); } if ($li_previous) { $items[] = array( - '#li_attributes' => array('class' => array('pager-previous')), + '#wrapper_attributes' => array('class' => array('pager-previous')), '#markup' => $li_previous, ); } @@ -252,7 +252,7 @@ function theme_pager($variables) { if ($i != $pager_max) { if ($i > 1) { $items[] = array( - '#li_attributes' => array('class' => array('pager-ellipsis')), + '#wrapper_attributes' => array('class' => array('pager-ellipsis')), '#markup' => '…', ); } @@ -260,7 +260,7 @@ function theme_pager($variables) { for (; $i <= $pager_last && $i <= $pager_max; $i++) { if ($i < $pager_current) { $items[] = array( - '#li_attributes' => array('class' => array('pager-item')), + '#wrapper_attributes' => array('class' => array('pager-item')), '#markup' => theme('pager_link', array( 'text' => $i, 'page_new' => pager_load_array($i - 1, $element, $pager_page_array), @@ -272,13 +272,13 @@ function theme_pager($variables) { } if ($i == $pager_current) { $items[] = array( - '#li_attributes' => array('class' => array('pager-current')), + '#wrapper_attributes' => array('class' => array('pager-current')), '#markup' => $i, ); } if ($i > $pager_current) { $items[] = array( - '#li_attributes' => array('class' => array('pager-item')), + '#wrapper_attributes' => array('class' => array('pager-item')), '#markup' => theme('pager_link', array( 'text' => $i, 'page_new' => pager_load_array($i - 1, $element, $pager_page_array), @@ -291,7 +291,7 @@ function theme_pager($variables) { } if ($i < $pager_max) { $items[] = array( - '#li_attributes' => array('class' => array('pager-ellipsis')), + '#wrapper_attributes' => array('class' => array('pager-ellipsis')), '#markup' => '…', ); } @@ -299,13 +299,13 @@ function theme_pager($variables) { // End generation. if ($li_next) { $items[] = array( - '#li_attributes' => array('class' => array('pager-next')), + '#wrapper_attributes' => array('class' => array('pager-next')), '#markup' => $li_next, ); } if ($li_last) { $items[] = array( - '#li_attributes' => array('class' => array('pager-last')), + '#wrapper_attributes' => array('class' => array('pager-last')), '#markup' => $li_last, ); } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 138b1f9..c8526ea 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2079,8 +2079,8 @@ function theme_mark($variables) { * @param $variables * An associative array containing: * - items: A list of items to render. Allowed values are strings or - * renderable arrays. Additionally, the key #li_attributes can be used to - * specify attributes for the li tag. + * renderable arrays. Additionally, the key #wrapper_attributes can be used + * to specify attributes for the wrapping li tag. * - title: The title of the list. * - type: The type of list to return (e.g. "ul", "ol"). * - attributes: The attributes applied to the list element. @@ -2101,8 +2101,8 @@ function theme_item_list($variables) { $i++; // @todo Support attributes on the li tag? How? if (is_array($item)) { - $attributes = isset($item['#li_attributes']) ? $item['#li_attributes'] : array(); - unset($item['#li_attributes']); + $attributes = isset($item['#wrapper_attributes']) ? $item['#wrapper_attributes'] : array(); + unset($item['#wrapper_attributes']); $item = drupal_render($item); }