commit 387ebe5f1b1b4684616516c81e85c5f8a96ff49f Author: James Wilson Date: Sat May 18 10:46:24 2013 -0400 Issue #1778990-39: dont render the markup by hand. diff --git a/core/includes/pager.inc b/core/includes/pager.inc index 9a73838..66851f4 100644 --- a/core/includes/pager.inc +++ b/core/includes/pager.inc @@ -368,15 +368,15 @@ function theme_pager($variables) { // First and previous links. if ($variables['first']) { - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-first')), - '#markup' => drupal_render($variables['first']), + $items[] = array_merge(array( + '#wrapper_attributes' => array('class' => array('pager-first'))), + $variables['first'] ); } if ($variables['previous']) { - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-previous')), - '#markup' => drupal_render($variables['previous']), + $items[] = array_merge(array( + '#wrapper_attributes' => array('class' => array('pager-previous'))), + $variables['previous'] ); } @@ -384,14 +384,14 @@ function theme_pager($variables) { if ($variables['less']) { $items[] = array( '#wrapper_attributes' => array('class' => array('pager-ellipsis')), - '#markup' => drupal_render($variables['less']), + '#markup' => $variables['less'], ); } foreach ($variables['items'] as $index => $item) { if ($index != $variables['current_index']) { - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-item')), - '#markup' => drupal_render($item), + $items[] = array_merge(array( + '#wrapper_attributes' => array('class' => array('pager-item'))), + $item ); } else { @@ -410,15 +410,15 @@ function theme_pager($variables) { // Next and last links. if ($variables['next']) { - $items[] = array( - '#wrapper_attributes' => array('class' => array('pager-next')), - '#markup' => drupal_render($variables['next']), + $items[] = array_merge(array( + '#wrapper_attributes' => array('class' => array('pager-next'))), + $variables['next'] ); } if ($variables['last']) { - $items[] = array( + $items[] = array_merge(array( '#wrapper_attributes' => array('class' => array('pager-last')), - '#markup' => drupal_render($variables['last']), + $variables['last'] ); }