Changeset 1910

Timestamp:

12/04/2004 12:12:08 AM (22 years ago)

Author:

rboren

Message:

Improve plugin hooks for rewrite manipulation. Allow pluggable template redirection.

Location:

trunk

Files:

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

trunk/wp-blog-header.php

@@ -208 +208 @@
 if ($pagenow == 'index.php') {
         if (! isset($wp_did_template_redirect)) {
+                $wp_did_template_redirect = true;
+                do_action('template_redirect', '');
                 if (is_feed()) {
                         $wp_did_template_redirect = true;

trunk/wp-includes/classes.php

@@ -705 +705 @@
         var $date_structure;
         var $front;
-        var $prefix = '';
+        var $root = '';
         var $index = 'index.php';
         var $matches = '';
+        var $rules;
         var $rewritecode = 
                 array(
@@ -877 +878 @@
         }
 
-        function generate_rewrite_rules($permalink_structure = '', $forcomments = false) {
+        function add_rewrite_tag($tag, $pattern, $query) {
+                $this->rewritecode[] = $tag;
+                $this->rewritereplace[] = $pattern;
+                $this->queryreplace[] = $query;
+        }
+
+        function generate_rewrite_rules($permalink_structure = '', $page = true, $feed = true, $forcomments = false) {
                 $feedregex2 = '(feed|rdf|rss|rss2|atom)/?$';
                 $feedregex = 'feed/' . $feedregex2;
@@ -933 +940 @@
                                 $feedquery2 .= '&withcomments=1';
                         }
-                                
-                        $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2, $pagematch => $pagequery);
+
+                        $rewrite = array();
+                        if ($feed) 
+                                $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
+                        if ($page)
+                                $rewrite = $rewrite + array($pagematch => $pagequery);
 
                         if ($num_toks) {
@@ -981 +992 @@
                 
                 // Root
-                $root_rewrite = $this->generate_rewrite_rules($this->prefix . '/');
+                $root_rewrite = $this->generate_rewrite_rules($this->root . '/');
 
                 // Comments
-                $comments_rewrite = $this->generate_rewrite_rules($this->prefix . 'comments', true);
+                $comments_rewrite = $this->generate_rewrite_rules($this->root . 'comments',true, true, true);
 
                 // Search
-                $search_structure = $this->prefix . "search/%search%";
+                $search_structure = $this->root . "search/%search%";
                 $search_rewrite = $this->generate_rewrite_rules($search_structure);
 
@@ -1001 +1012 @@
 
                 // Deprecated style static pages
-                $page_structure = $this->prefix . 'site/%pagename%';
+                $page_structure = $this->root . 'site/%pagename%';
                 $old_page_rewrite = $this->generate_rewrite_rules($page_structure);
 
                 // Put them together.
-                $this->rewrite = $page_rewrite + $root_rewrite + $comments_rewrite + $old_page_rewrite + $search_rewrite + $category_rewrite + $author_rewrite + $date_rewrite + $post_rewrite;
-
-                $this->rewrite = apply_filters('rewrite_rules_array', $this->rewrite);
-                return $this->rewrite;
+                $this->rules = $page_rewrite + $root_rewrite + $comments_rewrite + $old_page_rewrite + $search_rewrite + $category_rewrite + $author_rewrite + $date_rewrite + $post_rewrite;
+
+                do_action('generate_rewrite_rules', '');
+                $this->rules = apply_filters('rewrite_rules_array', $this->rules);
+                return $this->rules;
         }
 
@@ -1030 +1042 @@
                 $this->matches = '';
                 $rewrite = $this->rewrite_rules();
-
                 $num_rules = count($rewrite);
                 $rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
@@ -1062 +1073 @@
                 $this->permalink_structure = get_settings('permalink_structure');
                 $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));          
-                $this->prefix = '';
+                $this->root = '';
                 if ($this->using_index_permalinks()) {
-                        $this->prefix = $this->index . '/';
+                        $this->root = $this->index . '/';
                 }
                 $this->category_base = get_settings('category_base');

trunk/wp-includes/functions.php

@@ -2057 +2057 @@
         add_query_arg($key, '', $query);
 }
+
+function load_template($file) {
+        global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
+                $wp_rewrite, $wpdb;
+
+        extract($wp_query->query_vars);
+
+        include($file);
+}
 ?>