Changeset 640

Timestamp:

12/22/2003 11:00:45 PM (22 years ago)

Author:

emc3

Message:

Fixed %post_id% token handling. Fixed pingback link detection.

Location:

trunk

Files:

• wp-admin/options-permalink.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (4 diffs)
• wp-includes/template-functions.php (modified) (1 diff)

trunk/wp-admin/options-permalink.php

@@ -105 +105 @@
     '%monthnum%',
     '%day%',
-    '%postname%'
+    '%postname%',
+    '%post_id%'
 );
 $rewritereplace = array(
@@ -111 +112 @@
     '([0-9]{1,2})?',
     '([0-9]{1,2})?',
-    '([0-9a-z-]+)?'
+    '([0-9a-z-]+)?',
+    '([0-9]+)?'
 );
 $queryreplace = array (
@@ -117 +119 @@
     'monthnum=',
     'day=',
-    'name='
+    'name=',
+    'p='
 );
 

trunk/wp-includes/functions.php

@@ -494 +494 @@
         '%monthnum%',
         '%day%',
-        '%postname%'
+        '%postname%',
+        '%post_id%'
     );
     $rewritereplace = array(
@@ -500 +501 @@
         '([0-9]{1,2})?',
         '([0-9]{1,2})?',
-        '([0-9a-z-]+)?'
+        '([0-9a-z-]+)?',
+        '([0-9]+)?'
     );
 
@@ -517 +519 @@
         $value = $values[$i+1];
 
-        // Create a variable named $year, $monthnum, $day, or $postname:
+        // Create a variable named $year, $monthnum, $day, $postname, or $post_id:
         $$name = $value;
     }
     
-    // Build a WHERE clause, making the values safe along the way:
+    // If using %post_id%, we're done:
+    if (intval($post_id)) return intval($post_id);
+
+    // Otherwise, build a WHERE clause, making the values safe along the way:
     if ($year) $where .= " AND YEAR(post_date) = " . intval($year);
     if ($monthnum) $where .= " AND MONTH(post_date) = " . intval($monthnum);
@@ -528 +533 @@
 
     // Run the query to get the post ID:
-    return intval($wpdb->get_var("SELECT ID FROM $tableposts WHERE 1 = 1 " . $where));
+    $id = intval($wpdb->get_var("SELECT ID FROM $tableposts WHERE 1 = 1 " . $where));
+
+    return $id;
 }
 

trunk/wp-includes/template-functions.php

@@ -420 +420 @@
                 date('n', $unixtime),
                 date('j', $unixtime),
-                $post->post_name
+                $post->post_name,
+                $post->ID
             );
             return $siteurl . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));