Changeset 1759 for trunk/wp-includes/classes.php

Timestamp:

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

Author:

rboren

Message:

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

File:

• trunk/wp-includes/classes.php (modified) (6 diffs)

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 {