Changeset 3511

Timestamp:

02/10/2006 12:54:16 AM (21 years ago)

Author:

ryan

Message:

get_page_by_path. Some page uri cleanups.

Location:

trunk/wp-includes

Files:

• classes.php (modified) (2 diffs)
• functions-post.php (modified) (3 diffs)
• functions.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -368 +368 @@
                         $where .= " AND post_name = '" . $q['name'] . "'";
                 } else if ('' != $q['pagename']) {
+                        $reqpage = get_page_by_path($q['pagename']);
                         $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
                         $page_paths = '/' . trim($q['pagename'], '/');
                         $q['pagename'] = sanitize_title(basename($page_paths));
                         $q['name'] = $q['pagename'];
-                        $page_paths = explode('/', $page_paths);
-                        foreach($page_paths as $pathdir)
-                                $page_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
-                                
-                        $all_page_ids = get_all_page_ids();
-                        $reqpage = 0;
-                        if (is_array($all_page_ids)) { foreach ( $all_page_ids as $page_id ) {
-                                $page = get_page($page_id);
-                                if ( $page->fullpath == $page_path ) {
-                                        $reqpage = $page_id;
-                                        break;
-                                }
-                        } }
                         
                         $where .= " AND (ID = '$reqpage')";
@@ -1413 +1401 @@
 
         function flush_rules() {
-                generate_page_rewrite_rules();
+                generate_page_uri_index();
                 delete_option('rewrite_rules');
                 $this->wp_rewrite_rules();

trunk/wp-includes/functions-post.php

@@ -793 +793 @@
 }
 
-function generate_page_rewrite_rules() {
+function generate_page_uri_index() {
         global $wpdb;
         
@@ -801 +801 @@
         $posts = array_reverse($posts, true);
 
-        $page_rewrite_rules = array();
-        $page_attachment_rewrite_rules = array();
+        $page_uris = array();
+        $page_attachment_uris = array();
 
         if ($posts) {
@@ -814 +814 @@
                                 foreach ( $attachments as $attachment ) {
                                         $attach_uri = get_page_uri($attachment->ID);
-                                        $page_attachment_rewrite_rules[$attach_uri] = $attachment->post_name;
+                                        $page_attachment_uris[$attach_uri] = $attachment->ID;
                                 }
                         }
 
-                        $page_rewrite_rules[$uri] = $post;
-                }
-
-                update_option('page_uris', $page_rewrite_rules);
+                        $page_uris[$uri] = $id;
+                }
+
+                update_option('page_uris', $page_uris);
                 
-                if ( $page_attachment_rewrite_rules )
-                        update_option('page_attachment_uris', $page_attachment_rewrite_rules);
+                if ( $page_attachment_uris )
+                        update_option('page_attachment_uris', $page_attachment_uris);
         }
 }

trunk/wp-includes/functions.php

@@ -664 +664 @@
 
         return $page;
+}
+
+function get_page_by_path($page_path) {
+        global $wpdb;
+
+        $page_path = str_replace('%2F', '/', urlencode(urldecode($page_path)));
+        $page_paths = '/' . trim($page_path, '/');
+        $leaf_path  = sanitize_title(basename($page_paths));
+        $page_paths = explode('/', $page_paths);
+        foreach($page_paths as $pathdir)
+                $full_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir);
+
+        $pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_name = '$leaf_path'");
+
+        if ( empty($pages) ) 
+                return 0;
+
+        foreach ($pages as $page) {
+                $path = '/' . $leaf_path;
+                $curpage = $page;
+                while ($curpage->post_parent != 0) {
+                        $curpage = $wpdb->get_row("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = '$curpage->post_parent'");
+                        $path = '/' . $curpage->post_name . $path;
+                }
+
+                if ( $path == $full_path )
+                        return $page->ID;
+        }
+
+        return 0;
 }