mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-24 01:57:53 +01:00
Better page and subpage support for url_to_postid(). http://mosquito.wordpress.org/view.php?id=1214 Props: MC_incubus
git-svn-id: http://svn.automattic.com/wordpress/trunk@2527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
381e0879d0
commit
7b1a2648b3
@ -185,9 +185,9 @@ function url_to_postid($url = '') {
|
||||
if ($uri == $siteurl)
|
||||
return 0;
|
||||
|
||||
// First, check to see if there is a 'p=N' to match against:
|
||||
preg_match('#[?&]p=(\d+)#', $uri, $values);
|
||||
$p = intval($values[1]);
|
||||
// First, check to see if there is a 'p=N' or 'page_id=N' to match against:
|
||||
preg_match('#[?&](p|page_id)=(\d+)#', $uri, $values);
|
||||
$p = intval($values[2]);
|
||||
if ($p) return $p;
|
||||
|
||||
// Match $uri against our permalink structure
|
||||
@ -250,6 +250,14 @@ function url_to_postid($url = '') {
|
||||
return false;
|
||||
}
|
||||
|
||||
// if all we got was a postname, it's probably a page, so we'll want to check for a possible subpage
|
||||
if ($postname && !$year && !$monthnum && !$day && !$hour && !$minute && !$second) {
|
||||
$postname = rtrim(strstr($uri, $postname), '/');
|
||||
$uri_array = explode('/', $postname);
|
||||
$postname = $uri_array[count($uri_array) - 1];
|
||||
$where = " AND post_name = '" . $wpdb->escape($postname) . "' ";
|
||||
}
|
||||
|
||||
// Run the query to get the post ID:
|
||||
$id = intval($wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE 1 = 1 " . $where));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user