Changeset 1759

Timestamp:

10/08/2004 08:06:21 AM (22 years ago)

Author:

rboren

Message:

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

Location:

trunk

Files:

• wp-blog-header.php (modified) (1 diff)
• wp-includes/classes.php (modified) (6 diffs)
• wp-includes/template-functions-links.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -80 +80 @@
  }
 
-$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) {

trunk/wp-includes/classes.php

@@ -66 +66 @@
                 }
 
+                if ('' != $qv['static'] || '' != $qv['pagename'] || '' != $qv['page_id']) {
+                        $this->is_page = true;
+                        $this->is_single = false;
+                }
+
                 if ('' != $qv['second']) {
                         $this->is_time = true;
@@ -144 +149 @@
                 }
             
-                // single, date, and search override category.
-                if ($this->is_single || $this->is_date || $this->is_search) {
+                // single, page, date, and search override category.
+                if ($this->is_single || $this->is_page || $this->is_date || $this->is_search) {
                         $this->is_category = false;                
                 }
@@ -161 +166 @@
                 if ('' != $qv['feed']) {
                         $this->is_feed = true;
-                }
-
-                if ('' != $qv['static'] || '' != $qv['pagename']) {
-                        $this->is_page = true;
-                        $this->is_single = false;
                 }
 
@@ -268 +268 @@
                         $where .= " AND post_name = '" . $q['name'] . "'";
                 } else if ('' != $q['pagename']) {
-                        // If pagename is set, set static to true and set name to pagename.
                         $q['pagename'] = sanitize_title($q['pagename']);
                         $q['name'] = $q['pagename'];
-                        $q['static'] = true;
                         $where .= " AND post_name = '" . $q['pagename'] . "'";
                 }
@@ -285 +283 @@
                         $q['p'] = intval($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'];
                 }
 
@@ -456 +460 @@
                 }
 
-                if ('' != $q['static']) {
+                if (is_page()) {
                         $where .= ' AND (post_status = "static"';
                 } else {

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

@@ -97 +97 @@
                 $link = get_settings('home') . "/$link/";
         } else {
-                $link = get_settings('home') . "/index.php?p=$id&static=1";
+                $link = get_settings('home') . "/index.php?page_id=$id";
         }