diff -r fad9bb5c094b -r 02d315d1cc58 includes/functions.php --- a/includes/functions.php Mon Jan 21 10:17:26 2008 -0500 +++ b/includes/functions.php Mon Jan 21 15:37:28 2008 -0500 @@ -2142,7 +2142,7 @@ } } $url = sprintf($result_url, '0'); - $link = ( 0 == $start ) ? "" . $lang->get('pagination_btn_first') . "" : "« " . $lang->get('pagination_btn_first') . ""; + $link = ( 0 == $start ) ? "" . $lang->get('paginate_btn_first') . "" : "« " . $lang->get('paginate_btn_first') . ""; $blk->assign_vars(array( 'CLASS'=>$cls, 'LINK'=>$link @@ -2184,7 +2184,7 @@ $offset = strval($total); $url = sprintf($result_url, $offset); $j = $i + 1; - $link = ( $offset == strval($start) ) ? "" . $lang->get('pagination_btn_last') . "" : "" . $lang->get('pagination_btn_last') . " »"; + $link = ( $offset == strval($start) ) ? "" . $lang->get('paginate_btn_last') . "" : "" . $lang->get('paginate_btn_last') . " »"; $blk->assign_vars(array( 'CLASS'=>$cls, 'LINK'=>$link @@ -2255,6 +2255,8 @@ function paginate_array($q, $num_results, $result_url, $start = 0, $perpage = 10, $header = '', $footer = '') { global $db, $session, $paths, $template, $plugins; // Common objects + global $lang; + $num_pages = ceil ( $num_results / $perpage ); $out = ''; $i = 0; @@ -2263,13 +2265,14 @@ // Build paginator $begin = '
- '; + '; $block = ''; $end = '
Page:
' . $lang->get('paginate_lbl_page') . '{LINK}
'; $blk = $template->makeParserText($block); $inner = ''; $cls = 'row2'; $total = $num_pages * $perpage - $perpage; + /* if ( $start > 0 ) { $url = sprintf($result_url, abs($start - $perpage)); @@ -2281,6 +2284,7 @@ )); $inner .= $blk->run(); } + */ if ( $num_pages < 5 ) { for ( $i = 0; $i < $num_pages; $i++ ) @@ -2322,7 +2326,7 @@ } } $url = sprintf($result_url, '0'); - $link = ( 0 == $start ) ? "" . $lang->get('pagination_btn_first') . "" : "« " . $lang->get('pagination_btn_first') . ""; + $link = ( 0 == $start ) ? "" . $lang->get('paginate_btn_first') . "" : "« " . $lang->get('paginate_btn_first') . ""; $blk->assign_vars(array( 'CLASS'=>$cls, 'LINK'=>$link @@ -2362,7 +2366,7 @@ $offset = strval($total); $url = sprintf($result_url, $offset); $j = $i + 1; - $link = ( $offset == strval($start) ) ? "" . $lang->get('pagination_btn_last') . "" : "" . $lang->get('pagination_btn_last') . " »"; + $link = ( $offset == strval($start) ) ? "" . $lang->get('paginate_btn_last') . "" : "" . $lang->get('paginate_btn_last') . " »"; $blk->assign_vars(array( 'CLASS'=>$cls, 'LINK'=>$link @@ -2372,6 +2376,7 @@ } + /* if ( $start < $total ) { $link_offset = abs($start + $perpage); @@ -2384,6 +2389,7 @@ )); $inner .= $blk->run(); } + */ $inner .= '↓';