Changeset 1785

Show
Ignore:
Timestamp:
10/12/04 13:21:53 (4 years ago)
Author:
michelvaldrighi
Message:

fixed next_posts_links, removed debug artefacts lying there

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/template-functions-links.php

    r1784 r1785  
    505505    global $paged, $result, $request, $posts_per_page, $wpdb; 
    506506    if (!$max_page) { 
    507         $nxt_request = $request; 
    508         //if the query includes a limit clause, call it again without that 
    509         //limit clause! 
    510         if ($pos = strpos(strtoupper($request), 'LIMIT')) { 
    511             $nxt_request = substr($request, 0, $pos); 
    512         } 
    513         $nxt_result = $wpdb->query($nxt_request); 
    514         $numposts = $wpdb->num_rows; 
     507        preg_match('#WHERE (.*) GROUP BY#', $request, $matches); 
     508        $where = $matches[1]; 
     509        $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->posts WHERE $where"); 
    515510        $max_page = ceil($numposts / $posts_per_page); 
    516511    } 
    …… 
    546541} 
    547542 
    548 function posts_nav_link_old($sep=' — ', $prelabel='« Previous Page', $nxtlabel='Next Page »') { 
    549     global $request, $posts_per_page, $wpdb; 
    550     if (! is_single()) { 
    551         $show_what = get_query_var('what_to_show'); 
    552  
    553     if (get_query_var('what_to_show') == 'posts') { 
    554       $nxt_request = $request; 
    555       if ($pos = strpos(strtoupper($request), 'LIMIT')) { 
    556             $nxt_request = substr($request, 0, $pos); 
    557       } 
    558  
    559       $nxt_result = $wpdb->query($nxt_request); 
    560       $numposts = $wpdb->num_rows; 
    561       $max_page = ceil($numposts / $posts_per_page); 
    562     } else { 
    563       $max_page = 999999; 
    564     } 
    565  
    566         if ($max_page > 1) { 
    567             previous_posts_link($prelabel); 
    568             echo preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $sep); 
    569             next_posts_link($nxtlabel, $max_page); 
    570         } 
    571     } 
    572 } 
    573  
    574543function posts_nav_link($sep=' — ', $prelabel='« Previous Page', $nxtlabel='Next Page »') { 
    575544    global $request, $posts_per_page, $wpdb; 
    …… 
    577546 
    578547        if (get_query_var('what_to_show') == 'posts') { 
    579             preg_match('#WHERE 1=1 AND (.*)GROUP BY#', $request, $matches); 
     548            preg_match('#WHERE (.*) GROUP BY#', $request, $matches); 
    580549            $where = $matches[1]; 
    581550            $numposts = $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->posts WHERE $where");