Commit 6be5b36a authored by mundanity's avatar mundanity
Browse files

#859922

parent 4f724282

CHANGELOG.txt

+4 −3
Original line number Diff line number Diff line 
// $Id$

----------------------------------------------------------------------



v1.7       18/Jul/2010

(dev)      25/Jul/2010

----------------------------------------------------------------------



-   #858584: Identity vs. equality.

-   #859922: Incorrectly operating on node pagination style instead of

             value.





----------------------------------------------------------------------

v1.7       18/Jul/2010

----------------------------------------------------------------------

pagination.module

+4 −4
Original line number Diff line number Diff line
@@ -340,13 +340,13 @@ function pagination_preprocess_node(&$variables) { 
  if (false == $teaser) {



    $pg       =& Pagination::getInstance();

    $style =  $pg->getStyle($variables['type']);

    $paginate =  $pg->getValue($variables['type']);



    if ($style) {

    if ($paginate) {

      $variables['pager'] = $pg->getPager();

    }



    if ($style || variable_get('pagination_filter', 1) ) {

    if ($paginate || variable_get('pagination_filter', 1) ) {

      $headers = $pg->getHeaders($variables['node']->nid);

      $page    = $pg->getPageVar();

      $variables['content']    = preg_replace($pg->re_custom, '', $variables['content']);