golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More code cleanups from Mark Jaquith. fixes #1768 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-10-17 23:41:28 +00:00
parent 0b735b842f
commit 845917e6ff
2 changed files with 632 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
wp-includes/template-functions-general.php
View File

@ -9,6 +9,7 @@ function get_header() {
load_template( ABSPATH . 'wp-content/themes/default/header.php');
}
function get_footer() {
if ( file_exists( TEMPLATEPATH . '/footer.php') )
load_template( TEMPLATEPATH . '/footer.php');
@ -16,6 +17,7 @@ function get_footer() {
load_template( ABSPATH . 'wp-content/themes/default/footer.php');
}
function get_sidebar() {
if ( file_exists( TEMPLATEPATH . '/sidebar.php') )
load_template( TEMPLATEPATH . '/sidebar.php');
@ -28,35 +30,36 @@ function wp_loginout() {
global $user_ID;
get_currentuserinfo();
if ('' == $user_ID) :
if ('' == $user_ID)
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php">' . __('Login') . '</a>';
else :
else
$link = '<a href="' . get_settings('siteurl') . '/wp-login.php?action=logout">' . __('Logout') . '</a>';
endif;
echo apply_filters('loginout', $link);
}
function wp_register( $before = '<li>', $after = '</li>' ) {
global $user_ID;
get_currentuserinfo();
if ('' == $user_ID && get_settings('users_can_register') ) :
if ( '' == $user_ID && get_settings('users_can_register') )
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-register.php">' . __('Register') . '</a>' . $after;
elseif ('' == $user_ID && !get_settings('users_can_register') ) :
elseif ( '' == $user_ID && !get_settings('users_can_register') )
$link = '';
else :
else
$link = $before . '<a href="' . get_settings('siteurl') . '/wp-admin/">' . __('Site Admin') . '</a>' . $after;
endif;
echo apply_filters('register', $link);
}
function wp_meta() {
do_action('wp_meta');
}
function bloginfo($show='') {
$info = get_bloginfo($show);
if ( ! strstr($info, 'url') ) {
@ -67,6 +70,7 @@ function bloginfo($show='') {
echo $info;
}
function get_bloginfo($show='') {
switch($show) {
@ -131,6 +135,7 @@ function get_bloginfo($show='') {
return $output;
}
function wp_title($sep = '&raquo;', $display = true) {
global $wpdb;
global $m, $year, $monthnum, $day, $category_name, $month, $posts;
@ -142,19 +147,18 @@ function wp_title($sep = '&raquo;', $display = true) {
// If there's a category
if ( !empty($cat) ) {
if (!stristr($cat,'-')) { // category excluded
// category exclusion
if ( !stristr($cat,'-') )
$title = get_the_category_by_ID($cat);
}
}
if ( !empty($category_name) ) {
if ( stristr($category_name,'/') ) {
$category_name = explode('/',$category_name);
if ($category_name[count($category_name)-1]) {
if ( $category_name[count($category_name)-1] )
$category_name = $category_name[count($category_name)-1]; // no trailing slash
} else {
else
$category_name = $category_name[count($category_name)-2]; // there was a trailling slash
}
}
$title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
}
@ -163,50 +167,48 @@ function wp_title($sep = '&raquo;', $display = true) {
$my_year = substr($m, 0, 4);
$my_month = $month[substr($m, 4, 2)];
$title = "$my_year $sep $my_month";
}
if ( !empty($year) ) {
$title = $year;
if (!empty($monthnum)) {
if ( !empty($monthnum) )
$title .= " $sep ".$month[zeroise($monthnum, 2)];
}
if (!empty($day)) {
if ( !empty($day) )
$title .= " $sep ".zeroise($day, 2);
}
}
// If there's a post
// If there is a post
if ( is_single() || is_page() ) {
$title = strip_tags($posts[0]->post_title);
$title = apply_filters('single_post_title', $title);
}
// Send it out
if ($display && isset($title)) {
if ( $display && isset($title) )
echo " $sep $title";
} elseif (!$display && isset($title)) {
elseif ( !$display && isset($title) )
return " $sep $title";
}
}
function single_post_title($prefix = '', $display = true) {
global $wpdb;
$p = get_query_var('p');
$name = get_query_var('name');
if ( intval($p) || '' != $name ) {
if (!$p) {
if ( !$p )
$p = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_name = '$name'");
}
$post = & get_post($p);
$title = $post->post_title;
$title = apply_filters('single_post_title', $title);
if ($display) {
if ( $display )
echo $prefix.strip_tags($title);
} else {
else
return strip_tags($title);
}
}
}
function single_cat_title($prefix = '', $display = true ) {
$cat = intval( get_query_var('cat') );
@ -221,6 +223,7 @@ function single_cat_title($prefix = '', $display = true ) {
}
}
function single_month_title($prefix = '', $display = true ) {
global $m, $monthnum, $month, $year;
if ( !empty($monthnum) && !empty($year) ) {
@ -231,46 +234,53 @@ function single_month_title($prefix = '', $display = true ) {
$my_month = $month[substr($m, 4, 2)];
}
if (!empty($my_month) && $display) {
if ( !empty($my_month) && $display )
echo $prefix . $my_month . $prefix . $my_year;
} else {
else
return $monthnum;
}
}
/* link navigation hack by Orien http://icecode.com/ */
function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
$text = wptexturize($text);
$title_text = wp_specialchars($text, 1);
if ('link' == $format) {
if ('link' == $format)
return "\t<link rel='archives' title='$title_text' href='$url' />\n";
} elseif ('option' == $format) {
elseif ('option' == $format)
return "\t<option value='$url'>$before $text $after</option>\n";
} elseif ('html' == $format) {
elseif ('html' == $format)
return "\t<li>$before<a href='$url' title='$title_text'>$text</a>$after</li>\n";
} else { // custom
else // custom
return "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
}
}
function wp_get_archives($args = '') {
parse_str($args, $r);
if (!isset($r['type'])) $r['type'] = '';
if (!isset($r['limit'])) $r['limit'] = '';
if (!isset($r['format'])) $r['format'] = 'html';
if (!isset($r['before'])) $r['before'] = '';
if (!isset($r['after'])) $r['after'] = '';
if (!isset($r['show_post_count'])) $r['show_post_count'] = false;
if ( !isset($r['type']) )
$r['type'] = '';
if ( !isset($r['limit']) )
$r['limit'] = '';
if ( !isset($r['format']) )
$r['format'] = 'html';
if ( !isset($r['before']) )
$r['before'] = '';
if ( !isset($r['after']) )
$r['after'] = '';
if ( !isset($r['show_post_count']) )
$r['show_post_count'] = false;
get_archives($r['type'], $r['limit'], $r['format'], $r['before'], $r['after'], $r['show_post_count']);
}
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
global $month, $wpdb;
if ('' == $type) {
if ( '' == $type )
$type = 'monthly';
}
if ( '' != $limit ) {
$limit = (int) $limit;
@ -337,9 +347,7 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
$arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
$url = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?',
'=', $arc_year, '&amp;',
'=', $arcresult->week);
$url = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
echo get_archives_link($url, $text, $format, $before, $after);
}
@ -352,11 +360,10 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
if ( $arcresult->post_date != '0000-00-00 00:00:00' ) {
$url = get_permalink($arcresult);
$arc_title = $arcresult->post_title;
if ($arc_title) {
if ( $arc_title )
$text = strip_tags($arc_title);
} else {
else
$text = $arcresult->ID;
}
echo get_archives_link($url, $text, $format, $before, $after);
}
}
@ -364,12 +371,14 @@ function get_archives($type='', $limit='', $format='html', $before = '', $after
}
}
// Used in get_calendar
function calendar_week_mod($num) {
$base = 7;
return ($num - $base*floor($num/$base));
}
function get_calendar($daylength = 1) {
global $wpdb, $m, $monthnum, $year, $timedifference, $month, $month_abbrev, $weekday, $weekday_initial, $weekday_abbrev, $posts;
@ -380,11 +389,10 @@ function get_calendar($daylength = 1) {
return;
}
if (isset($_GET['w'])) {
if ( isset($_GET['w']) )
$w = ''.intval($_GET['w']);
}
// week_begins = 0 stands for sunday
// week_begins = 0 stands for Sunday
$week_begins = intval(get_settings('start_of_week'));
$add_hours = intval(get_settings('gmt_offset'));
$add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
@ -401,11 +409,10 @@ function get_calendar($daylength = 1) {
} elseif ( !empty($m) ) {
$calendar = substr($m, 0, 6);
$thisyear = ''.intval(substr($m, 0, 4));
if (strlen($m) < 6) {
if ( strlen($m) < 6 )
$thismonth = '01';
} else {
else
$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
}
} else {
$thisyear = gmdate('Y', current_time('timestamp') + get_settings('gmt_offset') * 3600);
$thismonth = gmdate('m', current_time('timestamp') + get_settings('gmt_offset') * 3600);
@ -434,9 +441,8 @@ function get_calendar($daylength = 1) {
<tr>';
$day_abbrev = $weekday_initial;
if ($daylength > 1) {
if ( $daylength > 1 )
$day_abbrev = $weekday_abbrev;
}
$myweek = array();
@ -495,13 +501,10 @@ function get_calendar($daylength = 1) {
if (strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') ||
strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') ||
strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari')) {
if ( strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') )
$ak_title_separator = "\n";
} else {
else
$ak_title_separator = ', ';
}
$ak_titles_for_day = array();
$ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
@ -513,21 +516,20 @@ function get_calendar($daylength = 1) {
);
if ( $ak_post_titles ) {
foreach ( $ak_post_titles as $ak_post_title ) {
if (empty($ak_titles_for_day['day_'.$ak_post_title->dom])) {
if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
}
if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one
if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
$ak_titles_for_day["$ak_post_title->dom"] = str_replace('"', '&quot;', wptexturize($ak_post_title->post_title));
} else {
else
$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . str_replace('"', '&quot;', wptexturize($ak_post_title->post_title));
}
}
}
// See how much we should pad in the beginning
$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
if (0 != $pad) echo "\n\t\t".'<td colspan="'.$pad.'" class="pad">&nbsp;</td>';
if ( 0 != $pad )
echo "\n\t\t".'<td colspan="'.$pad.'" class="pad">&nbsp;</td>';
$daysinmonth = intval(date('t', $unixmonth));
for ( $day = 1; $day <= $daysinmonth; ++$day ) {
@ -540,11 +542,10 @@ function get_calendar($daylength = 1) {
else
echo '<td>';
if (in_array($day, $daywithpost)) { // any posts today?
if ( in_array($day, $daywithpost) ) // any posts today?
echo '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>";
} else {
else
echo $day;
}
echo '</td>';
if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
@ -558,6 +559,7 @@ function get_calendar($daylength = 1) {
echo "\n\t</tr>\n\t</tbody>\n\t</table>";
}
function allowed_tags() {
global $allowedtags;
$allowed = '';
@ -573,39 +575,42 @@ function allowed_tags() {
return htmlentities($allowed);
}
/***** Date/Time tags *****/
function the_date_xml() {
global $post;
echo mysql2date('Y-m-d', $post->post_date);
//echo ""+$post->post_date;
}
function the_date($d='', $before='', $after='', $echo = true) {
global $id, $post, $day, $previousday, $newday;
$the_date = '';
if ( $day != $previousday ) {
$the_date .= $before;
if ($d=='') {
if ( $d=='' )
$the_date .= mysql2date(get_settings('date_format'), $post->post_date);
} else {
else
$the_date .= mysql2date($d, $post->post_date);
}
$the_date .= $after;
$previousday = $day;
}
$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
if ($echo) {
if ( $echo )
echo $the_date;
} else {
else
return $the_date;
}
}
function the_time( $d = '' ) {
echo apply_filters('the_time', get_the_time( $d ), $d);
}
function get_the_time( $d = '' ) {
if ( '' == $d )
$the_time = get_post_time(get_settings('time_format'));
@ -614,6 +619,7 @@ function get_the_time( $d = '' ) {
return apply_filters('get_the_time', $the_time, $d);
}
function get_post_time( $d = 'U', $gmt = false ) { // returns timestamp
global $post;
if ( $gmt )
@ -625,6 +631,7 @@ function get_post_time( $d = 'U', $gmt = false ) { // returns timestamp
return apply_filters('get_the_time', $time, $d, $gmt);
}
function the_weekday() {
global $weekday, $id, $post;
$the_weekday = $weekday[mysql2date('w', $post->post_date)];
@ -632,6 +639,7 @@ function the_weekday() {
echo $the_weekday;
}
function the_weekday_date($before='',$after='') {
global $weekday, $id, $post, $day, $previousweekday;
$the_weekday_date = '';

97
wp-includes/template-functions-links.php
View File

@ -1,15 +1,18 @@
<?php
function the_permalink() {
echo apply_filters('the_permalink', get_permalink());
}
function permalink_link() { // For backwards compatibility
echo apply_filters('the_permalink', get_permalink());
}
function permalink_anchor($mode = 'id') {
global $id, $post;
global $post;
switch ( strtolower($mode) ) {
case 'title':
$title = sanitize_title($post->post_title) . '-' . $id;
@ -17,11 +20,12 @@ function permalink_anchor($mode = 'id') {
break;
case 'id':
default:
echo '<a id="post-'.$id.'"></a>';
echo '<a id="post-' . $post->ID . '"></a>';
break;
}
}
function get_permalink($id = 0) {
$rewritecode = array(
'%year%',
@ -38,9 +42,8 @@ function get_permalink($id = 0) {
);
$post = &get_post($id);
if ($post->post_status == 'static') {
if ( $post->post_status == 'static' )
return get_page_link($post->ID);
}
$permalink = get_settings('permalink_structure');
@ -51,7 +54,8 @@ function get_permalink($id = 0) {
if ( strstr($permalink, '%category%') ) {
$cats = get_the_category($post->ID);
$category = $cats[0]->category_nicename;
if ($parent=$cats[0]->category_parent) $category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
if ( $parent=$cats[0]->category_parent )
$category = get_category_parents($parent, FALSE, '/', TRUE) . $category;
}
$authordata = get_userdata($post->post_author);
@ -80,9 +84,8 @@ function get_permalink($id = 0) {
function get_page_link($id = false) {
global $post, $wp_rewrite;
if (! $id) {
if ( !$id )
$id = $post->ID;
}
$pagestruct = $wp_rewrite->get_page_permastruct();
@ -99,7 +102,8 @@ function get_page_link($id = false) {
function get_year_link($year) {
global $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if ( !$year )
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
$yearlink = $wp_rewrite->get_year_permastruct();
if ( !empty($yearlink) ) {
$yearlink = str_replace('%year%', $year, $yearlink);
@ -111,8 +115,10 @@ function get_year_link($year) {
function get_month_link($year, $month) {
global $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
if ( !$year )
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if ( !$month )
$month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
$monthlink = $wp_rewrite->get_month_permastruct();
if ( !empty($monthlink) ) {
$monthlink = str_replace('%year%', $year, $monthlink);
@ -125,9 +131,12 @@ function get_month_link($year, $month) {
function get_day_link($year, $month, $day) {
global $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
if (!$day) $day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
if ( !$year )
$year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if ( !$month )
$month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
if ( !$day )
$day = gmdate('j', time()+(get_settings('gmt_offset') * 3600));
$daylink = $wp_rewrite->get_day_permastruct();
if ( !empty($daylink) ) {
@ -174,9 +183,8 @@ function edit_post_link($link = 'Edit This', $before = '', $after = '') {
get_currentuserinfo();
if (!user_can_edit_post($user_ID, $post->ID)) {
if ( !user_can_edit_post($user_ID, $post->ID) )
return;
}
$location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&amp;post=$post->ID";
echo $before . "<a href=\"$location\">$link</a>" . $after;
@ -187,9 +195,8 @@ function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
get_currentuserinfo();
if (!user_can_edit_post_comments($user_ID, $post->ID)) {
if ( !user_can_edit_post_comments($user_ID, $post->ID) )
return;
}
$location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&amp;comment=$comment->comment_ID";
echo $before . "<a href='$location'>$link</a>" . $after;
@ -200,9 +207,8 @@ function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
function get_previous_post($in_same_cat = false, $excluded_categories = '') {
global $post, $wpdb;
if(! is_single()) {
if ( !is_single() )
return null;
}
$current_post_date = $post->post_date;
@ -232,9 +238,8 @@ function get_previous_post($in_same_cat = false, $excluded_categories = '') {
function get_next_post($in_same_cat = false, $excluded_categories = '') {
global $post, $wpdb;
if(! is_single()) {
if ( !is_single() )
return null;
}
$current_post_date = $post->post_date;
@ -263,21 +268,17 @@ function get_next_post($in_same_cat = false, $excluded_categories = '') {
return @$wpdb->get_row("SELECT ID,post_title FROM $wpdb->posts $join WHERE post_date > '$current_post_date' AND post_date < '$now' AND post_status = 'publish' $sqlcat $sql_exclude_cats AND ID != $post->ID ORDER BY post_date ASC LIMIT 1");
}
function previous_post_link($format='&laquo; %link', $link='%title', $in_same_cat = false, $excluded_categories = '') {
$post = get_previous_post($in_same_cat, $excluded_categories);
if(! $post) {
if ( !$post )
return;
}
$title = apply_filters('the_title', $post->post_title, $post);
$string = '<a href="'.get_permalink($post->ID).'">';
$link = str_replace('%title', $title, $link);
$link = $string . $link . '</a>';
$format = str_replace('%link', $link, $format);
echo $format;
@ -286,23 +287,19 @@ function previous_post_link($format='&laquo; %link', $link='%title', $in_same_ca
function next_post_link($format='%link &raquo;', $link='%title', $in_same_cat = false, $excluded_categories = '') {
$post = get_next_post($in_same_cat, $excluded_categories);
if(! $post) {
if ( !$post )
return;
}
$title = apply_filters('the_title', $post->post_title, $post);
$string = '<a href="'.get_permalink($post->ID).'">';
$link = str_replace('%title', $title, $link);
$link = $string . $link . '</a>';
$format = str_replace('%link', $link, $format);
echo $format;
}
// Deprecated. Use previous_post_link().
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
@ -313,14 +310,12 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $
$post = get_previous_post($in_same_cat, $excluded_categories);
if(! $post) {
if ( !$post )
return;
}
$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
if ($title == 'yes') {
if ( 'yes' == $title )
$string .= apply_filters('the_title', $post->post_title, $post);
}
$string .= '</a>';
$format = str_replace('%', $string, $format);
echo $format;
@ -336,14 +331,12 @@ function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat=
$post = get_next_post($in_same_cat, $excluded_categories);
if(! $post) {
if ( !$post )
return;
}
$string = '<a href="'.get_permalink($post->ID).'">'.$next;
if ($title=='yes') {
if ( 'yes' == $title )
$string .= apply_filters('the_title', $post->post_title, $nextpost);
}
$string .= '</a>';
$format = str_replace('%', $string, $format);
echo $format;
@ -396,10 +389,9 @@ function get_pagenum_link($pagenum = 1) {
} else {
// If using path info style permalinks, make sure the index is in
// the URI.
if (strpos($qstr, $index) === false) {
if ( strpos($qstr, $index) === false )
$qstr = '/' . $index . $qstr;
}
}
$qstr = trailingslashit($qstr) . $page_modstring . $pagenum;
} else {
@ -408,11 +400,12 @@ function get_pagenum_link($pagenum = 1) {
}
$qstr = preg_replace('|^/+|', '', $qstr);
if ($permalink) $qstr = trailingslashit($qstr);
if ( $permalink )
$qstr = trailingslashit($qstr);
$qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', trailingslashit( get_settings('home') ) . $qstr );
// showing /page/1/ or ?paged=1 is redundant
if ($pagenum === 1) {
if ( 1 === $pagenum ) {
$qstr = str_replace('page/1/', '', $qstr); // for mod_rewrite style
$qstr = remove_query_arg('paged', $qstr); // for query style
}
@ -423,13 +416,13 @@ function next_posts($max_page = 0) { // original by cfactor at cooltux.org
global $paged, $pagenow;
if ( !is_single() ) {
if (!$paged) $paged = 1;
if ( !$paged )
$paged = 1;
$nextpage = intval($paged) + 1;
if (!$max_page || $max_page >= $nextpage) {
if ( !$max_page || $max_page >= $nextpage )
echo get_pagenum_link($nextpage);
}
}
}
function next_posts_link($label='Next Page &raquo;', $max_page=0) {
global $paged, $result, $request, $posts_per_page, $wpdb, $max_num_pages;
@ -455,15 +448,17 @@ function next_posts_link($label='Next Page &raquo;', $max_page=0) {
function previous_posts() { // original by cfactor at cooltux.org
global $_SERVER, $paged, $pagenow;
global $paged, $pagenow;
if ( !is_single() ) {
$nextpage = intval($paged) - 1;
if ($nextpage < 1) $nextpage = 1;
if ( $nextpage < 1 )
$nextpage = 1;
echo get_pagenum_link($nextpage);
}
}
function previous_posts_link($label='&laquo; Previous Page') {
global $paged;
if ( (!is_single()) && ($paged > 1) ) {
@ -477,7 +472,7 @@ function posts_nav_link($sep=' &#8212; ', $prelabel='&laquo; Previous Page', $nx
global $request, $posts_per_page, $wpdb, $max_num_pages;
if ( !is_single() ) {
if (get_query_var('what_to_show') == 'posts') {
if ( 'posts' == get_query_var('what_to_show') ) {
if ( !isset($max_num_pages) ) {
preg_match('#FROM\s(.*)\sGROUP BY#siU', $request, $matches);
$fromwhere = $matches[1];