Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-05 16:08:12 +01:00
Code Issues Projects Releases Wiki Activity

Use page_id=xx instead of p=xx&static=1

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@1759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2004-10-08 08:06:21 +00:00
parent 943351b556
commit ff3d47b742
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-blog-header.php
View File

@ -79,7 +79,7 @@ if ((isset($_GET['error']) && $_GET['error'] == '404') ||
} }
} }
$wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'error'); $wpvarstoreset = array('m','p','posts','w', 'cat','withcomments','s','search','exact', 'sentence','poststart','postend','preview','debug', 'calendar','page','paged','more','tb', 'pb','author','order','orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error');
for ($i=0; $i<count($wpvarstoreset); $i += 1) { for ($i=0; $i<count($wpvarstoreset); $i += 1) {
$wpvar = $wpvarstoreset[$i]; $wpvar = $wpvarstoreset[$i];

24
wp-includes/classes.php
View File

@ -65,6 +65,11 @@ class WP_Query {
$this->is_single = true; $this->is_single = true;
} }
if ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) {
$this->is_page = true;
$this->is_single = false;
}
if ('' != $qv['second']) { if ('' != $qv['second']) {
$this->is_time = true; $this->is_time = true;
$this->is_date = true; $this->is_date = true;
@ -143,8 +148,8 @@ class WP_Query {
$this->is_category = true; $this->is_category = true;
} }
// single, date, and search override category. // single, page, date, and search override category.
if ($this->is_single || $this->is_date || $this->is_search) { if ($this->is_single || $this->is_page || $this->is_date || $this->is_search) {
$this->is_category = false; $this->is_category = false;
} }
@ -162,11 +167,6 @@ class WP_Query {
$this->is_feed = true; $this->is_feed = true;
} }
if ('' != $qv['static'] || '' != $qv['pagename']) {
$this->is_page = true;
$this->is_single = false;
}
if ('404' == $qv['error']) { if ('404' == $qv['error']) {
$this->is_404 = true; $this->is_404 = true;
} }
@ -267,10 +267,8 @@ class WP_Query {
$q['name'] = sanitize_title($q['name']); $q['name'] = sanitize_title($q['name']);
$where .= " AND post_name = '" . $q['name'] . "'"; $where .= " AND post_name = '" . $q['name'] . "'";
} else if ('' != $q['pagename']) { } else if ('' != $q['pagename']) {
// If pagename is set, set static to true and set name to pagename.
$q['pagename'] = sanitize_title($q['pagename']); $q['pagename'] = sanitize_title($q['pagename']);
$q['name'] = $q['pagename']; $q['name'] = $q['pagename'];
$q['static'] = true;
$where .= " AND post_name = '" . $q['pagename'] . "'"; $where .= " AND post_name = '" . $q['pagename'] . "'";
} }
@ -286,6 +284,12 @@ class WP_Query {
$where = ' AND ID = '.$q['p']; $where = ' AND ID = '.$q['p'];
} }
if (($q['page_id'] != '') && ($q['page_id'] != 'all')) {
$q['page_id'] = intval($q['page_id']);
$q['p'] = $q['page_id'];
$where = ' AND ID = '.$q['page_id'];
}
// If a search pattern is specified, load the posts that match // If a search pattern is specified, load the posts that match
if (!empty($q['s'])) { if (!empty($q['s'])) {
$q['s'] = addslashes_gpc($q['s']); $q['s'] = addslashes_gpc($q['s']);
@ -455,7 +459,7 @@ class WP_Query {
$distinct = 'DISTINCT'; $distinct = 'DISTINCT';
} }
if ('' != $q['static']) { if (is_page()) {
$where .= ' AND (post_status = "static"'; $where .= ' AND (post_status = "static"';
} else { } else {
$where .= ' AND (post_status = "publish"'; $where .= ' AND (post_status = "publish"';

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

@ -96,7 +96,7 @@ function get_page_link($id = false) {
$link = get_page_uri($id); $link = get_page_uri($id);
$link = get_settings('home') . "/$link/"; $link = get_settings('home') . "/$link/";
} else { } else {
$link = get_settings('home') . "/index.php?p=$id&static=1"; $link = get_settings('home') . "/index.php?page_id=$id";
} }
return $link; return $link;