[wp-cvs] wordpress/wp-includes comment-functions.php, 1.25,
1.26 feed-functions.php, 1.3,
1.4 template-functions-author.php, 1.20,
1.21 template-functions-category.php, 1.52,
1.53 template-functions-general.php, 1.67,
1.68 template-functions-links.php, 1.54,
1.55 template-functions-post.php, 1.44, 1.45 vars.php, 1.47, 1.48
Matthew Mullenweg
saxmatt at users.sourceforge.net
Mon Feb 7 07:37:56 GMT 2005
- Previous message: [wp-cvs] wordpress wp-settings.php,1.73,1.74
- Next message: [wp-cvs] wordpress/wp-includes default-filters.php, NONE,
1.1 functions-formatting.php, 1.65, 1.66 functions.php, 1.254,
1.255 template-functions-post.php, 1.45, 1.46 vars.php, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10719/wp-includes
Modified Files:
comment-functions.php feed-functions.php
template-functions-author.php template-functions-category.php
template-functions-general.php template-functions-links.php
template-functions-post.php vars.php
Log Message:
Remove querystring variable legacy code
Index: feed-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/feed-functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** feed-functions.php 6 Feb 2005 03:40:08 -0000 1.3
--- feed-functions.php 7 Feb 2005 07:37:53 -0000 1.4
***************
*** 77,81 ****
function comments_rss($commentsrssfilename = 'wp-commentsrss2.php') {
global $id;
- global $querystring_start, $querystring_equal, $querystring_separator;
if ('' != get_settings('permalink_structure'))
--- 77,80 ----
***************
*** 88,92 ****
function get_author_rss_link($echo = false, $author_id, $author_nicename) {
- global $querystring_start, $querystring_equal;
$auth_ID = $author_id;
$permalink_structure = get_settings('permalink_structure');
--- 87,90 ----
***************
*** 94,98 ****
if ('' == $permalink_structure) {
$file = get_settings('siteurl') . '/wp-rss2.php';
! $link = $file . $querystring_start . 'author' . $querystring_equal . $author_id;
} else {
$link = get_author_link(0, $author_id, $author_nicename);
--- 92,96 ----
if ('' == $permalink_structure) {
$file = get_settings('siteurl') . '/wp-rss2.php';
! $link = $file . '?author=' . $author_id;
} else {
$link = get_author_link(0, $author_id, $author_nicename);
***************
*** 105,109 ****
function get_category_rss_link($echo = false, $category_id, $category_nicename) {
- global $querystring_start, $querystring_equal;
$cat_ID = $category_id;
$permalink_structure = get_settings('permalink_structure');
--- 103,106 ----
***************
*** 111,115 ****
if ('' == $permalink_structure) {
$file = get_settings('siteurl') . '/wp-rss2.php';
! $link = $file . $querystring_start . 'cat' . $querystring_equal . $category_id;
} else {
$link = get_category_link(0, $category_id, $category_nicename);
--- 108,112 ----
if ('' == $permalink_structure) {
$file = get_settings('siteurl') . '/wp-rss2.php';
! $link = $file . '?cat=' . $category_id;
} else {
$link = get_category_link(0, $category_id, $category_nicename);
Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** template-functions-links.php 6 Feb 2005 03:40:08 -0000 1.54
--- template-functions-links.php 7 Feb 2005 07:37:53 -0000 1.55
***************
*** 103,107 ****
function get_year_link($year) {
! global $querystring_start, $querystring_equal, $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
$yearlink = $wp_rewrite->get_year_permastruct();
--- 103,107 ----
function get_year_link($year) {
! global $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
$yearlink = $wp_rewrite->get_year_permastruct();
***************
*** 110,119 ****
return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
} else {
! return apply_filters('year_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year, $year);
}
}
function get_month_link($year, $month) {
! global $querystring_start, $querystring_equal, $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
--- 110,119 ----
return apply_filters('year_link', get_settings('home') . trailingslashit($yearlink), $year);
} else {
! return apply_filters('year_link', get_settings('home') . '/?m=' . $year, $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));
***************
*** 124,133 ****
return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
} else {
! return apply_filters('month_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2), $year, $month);
}
}
function get_day_link($year, $month, $day) {
! global $querystring_start, $querystring_equal, $wp_rewrite;
if (!$year) $year = gmdate('Y', time()+(get_settings('gmt_offset') * 3600));
if (!$month) $month = gmdate('m', time()+(get_settings('gmt_offset') * 3600));
--- 124,133 ----
return apply_filters('month_link', get_settings('home') . trailingslashit($monthlink), $year, $month);
} else {
! return apply_filters('month_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2), $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));
***************
*** 141,145 ****
return apply_filters('day_link', get_settings('home') . trailingslashit($daylink), $year, $month, $day);
} else {
! return apply_filters('day_link', get_settings('home') .'/'. $querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2), $year, $month, $day);
}
}
--- 141,145 ----
return apply_filters('day_link', get_settings('home') . trailingslashit($daylink), $year, $month, $day);
} else {
! return apply_filters('day_link', get_settings('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
}
}
***************
*** 301,305 ****
global $id, $post, $wpdb;
global $posts, $posts_per_page, $s;
- global $querystring_start, $querystring_equal, $querystring_separator;
if(($posts_per_page == 1) || is_single()) {
--- 301,304 ----
***************
*** 404,412 ****
} else {
// we need to know the way queries are being written
- global $querystring_start, $querystring_equal, $querystring_separator;
// if there's a querystring_start (a "?" usually), it's deffinitely not mod_rewritten
! if ( stristr( $qstr, $querystring_start ) ){
// so append the query string (using &, since we already have ?)
! $qstr .= $querystring_separator.$page_querystring.$querystring_equal.$pagenum;
// otherwise, it could be rewritten, OR just the default index ...
} elseif( '' != get_settings('permalink_structure')) {
--- 403,410 ----
} else {
// we need to know the way queries are being written
// if there's a querystring_start (a "?" usually), it's deffinitely not mod_rewritten
! if ( stristr( $qstr, '?' ) ){
// so append the query string (using &, since we already have ?)
! $qstr .= '&' . $page_querystring . '=' . $pagenum;
// otherwise, it could be rewritten, OR just the default index ...
} elseif( '' != get_settings('permalink_structure')) {
***************
*** 426,430 ****
$qstr = trailingslashit($qstr) . $page_modstring . $pagenum;
} else {
! $qstr = $index . $querystring_start.$page_querystring.$querystring_equal.$pagenum;
}
}
--- 424,428 ----
$qstr = trailingslashit($qstr) . $page_modstring . $pagenum;
} else {
! $qstr = $index . '?' . $page_querystring . '=' . $pagenum;
}
}
***************
*** 437,441 ****
function next_posts($max_page = 0) { // original by cfactor at cooltux.org
global $paged, $pagenow;
- global $querystring_start, $querystring_equal, $querystring_separator;
if (! is_single()) {
--- 435,438 ----
***************
*** 469,473 ****
function previous_posts() { // original by cfactor at cooltux.org
global $_SERVER, $paged, $pagenow;
- global $querystring_start, $querystring_equal, $querystring_separator;
if (! is_single()) {
--- 466,469 ----
Index: template-functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-post.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** template-functions-post.php 6 Feb 2005 03:40:08 -0000 1.44
--- template-functions-post.php 7 Feb 2005 07:37:53 -0000 1.45
***************
*** 171,175 ****
global $id, $page, $numpages, $multipage, $more;
global $pagenow;
- global $querystring_start, $querystring_equal, $querystring_separator;
if ($more_file != '') {
$file = $more_file;
--- 171,174 ----
***************
*** 185,191 ****
if (($i != $page) || ((!$more) && ($page==1))) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="'.get_permalink().$querystring_separator.'page'.$querystring_equal.$i.'">';
} else {
! echo '<a href="'.get_permalink().$i.'/">';
}
}
--- 184,190 ----
if (($i != $page) || ((!$more) && ($page==1))) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="' . get_permalink() . '&page=' . $i . '">';
} else {
! echo '<a href="' . get_permalink() . $i . '/">';
}
}
***************
*** 201,207 ****
if ($i && $more) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="'.get_permalink().$querystring_separator.'page'.$querystring_equal.$i.'">'.$previouspagelink.'</a>';
} else {
! echo '<a href="'.get_permalink().$i.'/">'.$previouspagelink.'</a>';
}
}
--- 200,206 ----
if ($i && $more) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="' . get_permalink() '&page=' . $i . '">'.$previouspagelink.'</a>';
} else {
! echo '<a href="' . get_permalink() . $i . '/">'.$previouspagelink.'</a>';
}
}
***************
*** 209,213 ****
if ($i<=$numpages && $more) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="'.get_permalink().$querystring_separator.'page'.$querystring_equal.$i.'">'.$nextpagelink.'</a>';
} else {
echo '<a href="'.get_permalink().$i.'/">'.$nextpagelink.'</a>';
--- 208,212 ----
if ($i<=$numpages && $more) {
if ('' == get_settings('permalink_structure')) {
! echo '<a href="'.get_permalink() . '&page=' . $i . '">'.$nextpagelink.'</a>';
} else {
echo '<a href="'.get_permalink().$i.'/">'.$nextpagelink.'</a>';
Index: template-functions-author.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-author.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** template-functions-author.php 6 Feb 2005 03:40:08 -0000 1.20
--- template-functions-author.php 7 Feb 2005 07:37:53 -0000 1.21
***************
*** 124,128 ****
function get_author_link($echo = false, $author_id, $author_nicename) {
! global $wpdb, $wp_rewrite, $post, $querystring_start, $querystring_equal, $cache_userdata;
$auth_ID = $author_id;
$link = $wp_rewrite->get_author_permastruct();
--- 124,128 ----
function get_author_link($echo = false, $author_id, $author_nicename) {
! global $wpdb, $wp_rewrite, $post, $cache_userdata;
$auth_ID = $author_id;
$link = $wp_rewrite->get_author_permastruct();
***************
*** 130,134 ****
if (empty($link)) {
$file = get_settings('home') . '/';
! $link = $file.$querystring_start.'author'.$querystring_equal.$auth_ID;
} else {
if ('' == $author_nicename) $author_nicename = $cache_userdata[$author_id]->author_nicename;
--- 130,134 ----
if (empty($link)) {
$file = get_settings('home') . '/';
! $link = $file . '?author=' . .$auth_ID;
} else {
if ('' == $author_nicename) $author_nicename = $cache_userdata[$author_id]->author_nicename;
Index: vars.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/vars.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** vars.php 7 Feb 2005 07:25:29 -0000 1.47
--- vars.php 7 Feb 2005 07:37:53 -0000 1.48
***************
*** 10,16 ****
$pagenow = explode('?', $pagenow);
$pagenow = $pagenow[0];
- if (($querystring_start == '/') && ($pagenow != 'post.php')) {
- $pagenow = get_settings('siteurl') . '/';
- }
} else {
$pagenow = 'index.php';
--- 10,13 ----
Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** comment-functions.php 6 Feb 2005 03:40:08 -0000 1.25
--- comment-functions.php 7 Feb 2005 07:37:52 -0000 1.26
***************
*** 93,97 ****
function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb;
- global $querystring_start, $querystring_equal, $querystring_separator;
global $comment_count_cache;
--- 93,96 ----
***************
*** 114,118 ****
echo '<a href="';
if ($wpcommentsjavascript) {
! echo get_settings('siteurl') . '/' . $wpcommentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
//echo get_permalink();
echo '" onclick="wpopen(this.href); return false"';
--- 113,117 ----
echo '<a href="';
if ($wpcommentsjavascript) {
! echo get_settings('siteurl') . '/' . $wpcommentspopupfile.'?p='.$id.'amp;c=1';
//echo get_permalink();
echo '" onclick="wpopen(this.href); return false"';
***************
*** 636,640 ****
function wp_notify_postauthor($comment_id, $comment_type='') {
global $wpdb;
- global $querystring_start, $querystring_equal, $querystring_separator;
$comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
--- 635,638 ----
Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** template-functions-general.php 6 Feb 2005 03:40:08 -0000 1.67
--- template-functions-general.php 7 Feb 2005 07:37:53 -0000 1.68
***************
*** 263,267 ****
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
! global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb;
if ('' == $type) {
--- 263,267 ----
function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
! global $month, $wpdb;
if ('' == $type) {
***************
*** 277,283 ****
// archive link url
! $archive_link_m = get_settings('siteurl').'/'.$querystring_start.'m'.$querystring_equal; # monthly archive;
! $archive_link_w = get_settings('siteurl').'/'.$querystring_start.'w'.$querystring_equal; # weekly archive;
! $archive_link_p = get_settings('siteurl').'/'.$querystring_start.'p'.$querystring_equal; # post-by-post archive;
// over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
--- 277,283 ----
// archive link url
! $archive_link_m = get_settings('siteurl') . '/?m='; # monthly archive;
! $archive_link_w = get_settings('siteurl') . '/?w='; # weekly archive;
! $archive_link_p = get_settings('siteurl') . '/?p='; # post-by-post archive;
// over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
***************
*** 339,345 ****
$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'), '', $querystring_start,
! $querystring_equal, $arc_year, $querystring_separator,
! $querystring_equal, $arcresult->week);
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
echo get_archives_link($url, $text, $format, $before, $after);
--- 339,345 ----
$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, '&',
! '=', $arcresult->week);
$text = $arc_week_start . $archive_week_separator . $arc_week_end;
echo get_archives_link($url, $text, $format, $before, $after);
Index: template-functions-category.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-category.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** template-functions-category.php 6 Feb 2005 03:40:08 -0000 1.52
--- template-functions-category.php 7 Feb 2005 07:37:53 -0000 1.53
***************
*** 26,30 ****
function get_category_link($echo = false, $category_id, $category_nicename) {
! global $wpdb, $wp_rewrite, $post, $querystring_start, $querystring_equal, $cache_categories;
$cat_ID = $category_id;
$catlink = $wp_rewrite->get_category_permastruct();
--- 26,30 ----
function get_category_link($echo = false, $category_id, $category_nicename) {
! global $wpdb, $wp_rewrite, $post, $cache_categories;
$cat_ID = $category_id;
$catlink = $wp_rewrite->get_category_permastruct();
***************
*** 32,36 ****
if (empty($catlink)) {
$file = get_settings('home') . '/';
! $catlink = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
} else {
$category_nicename = $cache_categories[$category_id]->category_nicename;
--- 32,36 ----
if (empty($catlink)) {
$file = get_settings('home') . '/';
! $catlink = $file . '?cat=' . $cat_ID;
} else {
$category_nicename = $cache_categories[$category_id]->category_nicename;
***************
*** 183,187 ****
$selected=0, $hide=0) {
global $wpdb;
- global $querystring_start, $querystring_equal, $querystring_separator;
if (($file == 'blah') || ($file == '')) $file = get_settings('home') . '/';
if (!$selected) $selected=$cat;
--- 183,186 ----
***************
*** 254,258 ****
function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=FALSE) {
global $wpdb, $category_posts;
- global $querystring_start, $querystring_equal, $querystring_separator;
// Optiondates now works
if ('' == $file) {
--- 253,256 ----
***************
*** 309,322 ****
}
- if (intval($optionall) == 1 && !$child_of && $categories) {
- $all = apply_filters('list_cats', $all);
- $link = "<a href=\"".$file.$querystring_start.'cat'.$querystring_equal.'all">'.$all."</a>";
- if ($list) {
- echo "\n\t<li>$link</li>";
- } else {
- echo "\t$link<br />\n";
- }
- }
-
$num_found=0;
$thelist = "";
--- 307,310 ----
- Previous message: [wp-cvs] wordpress wp-settings.php,1.73,1.74
- Next message: [wp-cvs] wordpress/wp-includes default-filters.php, NONE,
1.1 functions-formatting.php, 1.65, 1.66 functions.php, 1.254,
1.255 template-functions-post.php, 1.45, 1.46 vars.php, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list