Changeset 4495 for trunk/wp-includes/rewrite.php

Timestamp:

11/19/2006 07:56:05 AM (19 years ago)

Author:

ryan

Message:

Remove trailing spaces and convert spaces to tabs. Props Nazgul. fixes #986

File:

• trunk/wp-includes/rewrite.php (modified) (25 diffs)

trunk/wp-includes/rewrite.php

@@ -17 +17 @@
         return;
     }
-    
+
     $qv = trim($tagname, '%');
-    
+
     global $wp_rewrite, $wp;
     $wp->add_query_var($qv);
@@ -25 +25 @@
 }
 
-//Add a new feed type like /atom1/ 
+//Add a new feed type like /atom1/
 function add_feed($feedname, $function) {
     global $wp_rewrite;
@@ -170 +170 @@
     var $endpoints;
     var $use_verbose_rules = false;
-    var $rewritecode = 
+    var $rewritecode =
         array(
                     '%year%',
@@ -186 +186 @@
                     );
 
-    var $rewritereplace = 
+    var $rewritereplace =
         array(
                     '([0-9]{4})',
@@ -202 +202 @@
                     );
 
-    var $queryreplace = 
+    var $queryreplace =
         array (
                     'year=',
@@ -219 +219 @@
 
     var $feeds = array ( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
-    
+
     function using_permalinks() {
         if (empty($this->permalink_structure))
@@ -236 +236 @@
             return true;
         }
-    
+
         return false;
     }
@@ -252 +252 @@
 
         if (! empty($this->matches)) {
-            $match_prefix = '$' . $this->matches . '['; 
+            $match_prefix = '$' . $this->matches . '[';
             $match_suffix = ']';
-        }        
-
-        return "$match_prefix$number$match_suffix";        
+        }
+
+        return "$match_prefix$number$match_suffix";
     }
 
@@ -302 +302 @@
                 break;
             }
-        } 
+        }
 
         if ( empty($date_endian) )
@@ -308 +308 @@
 
         // Do not allow the date tags and %post_id% to overlap in the permalink
-        // structure. If they do, move the date tags to $front/date/.  
+        // structure. If they do, move the date tags to $front/date/.
         $front = $this->front;
         preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
@@ -483 +483 @@
         $trackbackregex = 'trackback/?$';
         $pageregex = 'page/?([0-9]{1,})/?$';
-        
+
         //build up an array of endpoint regexes to append => queries to append
         if ($endpoints) {
             $ep_query_append = array ();
-            foreach ($this->endpoints as $endpoint) { 
+            foreach ($this->endpoints as $endpoint) {
                 //match everything after the endpoint name, but allow for nothing to appear there
                 $epmatch = $endpoint[1] . '(/(.*))?/?$';
@@ -512 +512 @@
                 $queries[$i] = $queries[$i - 1] . '&';
             }
-             
+
             $query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
             $queries[$i] .= $query_token;
@@ -549 +549 @@
             //get the 'tagname=$matches[i]'
             $query = $queries[$num_toks - 1];
-            
+
             //set up $ep_mask_specific which is used to match more specific URL types
             switch ($dirs[$j]) {
@@ -581 +581 @@
             if ($paged) //...and /page/xx ones
                 $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
-            
+
             //if we've got some tags in this dir
             if ($num_toks) {
                 $post = false;
                 $page = false;
-                
-                //check to see if this dir is permalink-level: i.e. the structure specifies an 
+
+                //check to see if this dir is permalink-level: i.e. the structure specifies an
                 //individual post. Do this by checking it contains at least one of 1) post name,
-                //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and 
+                //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
                 //minute all present). Set these flags now as we need them for the endpoints.
                 if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
@@ -598 +598 @@
                         $page = true;
                 }
-                
+
                 //do endpoints
                 if ($endpoints) {
@@ -608 +608 @@
                     }
                 }
-                
+
                 //if we're creating rules for a permalink, do all the endpoints like attachments etc
                 if ($post) {
@@ -619 +619 @@
                     //get rid of brackets
                     $submatchbase = str_replace(array('(',')'),'',$match);
-                    
+
                     //add a rule for at attachments, which take the form of <permalink>/some-text
                     $sub1 = $submatchbase . '/([^/]+)/';
@@ -627 +627 @@
                     //add an ? as we don't have to match that last slash, and finally a $ so we
                     //match to the end of the URL
-                    
+
                     //add another rule to match attachments in the explicit form:
                     //<permalink>/attachment/some-text
@@ -634 +634 @@
                     $sub2feed = $sub2 . $feedregex;    //feeds, <permalink>/attachment/feed/(atom|...)
                     $sub2feed2 = $sub2 . $feedregex2;  //and feeds again on to this <permalink>/attachment/(feed|atom...)
-                    
+
                     //create queries for these extra tag-ons we've just dealt with
                     $subquery = $index . '?attachment=' . $this->preg_index(1);
                     $subtbquery = $subquery . '&tb=1';
                     $subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-                    
+
                     //do endpoints for attachments
                     if ($endpoint) { foreach ($ep_query_append as $regex => $ep) {
@@ -647 +647 @@
                         }
                     } }
-                    
+
                     //now we've finished with endpoints, finish off the $sub1 and $sub2 matches
                     $sub1 .= '?$';
                     $sub2 .= '?$';
-                    
+
                     //allow URLs like <permalink>/2 for <permalink>/page/2
                     $match = $match . '(/[0-9]+)?/?$';
@@ -660 +660 @@
                     $query = $index . '?' . $query;
                 }
-                
+
                 //create the final array for this dir by joining the $rewrite array (which currently
                 //only contains rules/queries for trackback, pages etc) to the main regex/query for
@@ -670 +670 @@
                     //add trackback
                     $rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
-                    
+
                     //add regexes/queries for attachments, attachment trackbacks and so on
                     if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
@@ -764 +764 @@
         $home_root = parse_url(get_option('home'));
         $home_root = trailingslashit($home_root['path']);
-    
+
         $rules = "<IfModule mod_rewrite.c>\n";
         $rules .= "RewriteEngine On\n";
         $rules .= "RewriteBase $home_root\n";
-        
+
         //add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all)
         foreach ($this->non_wp_rules as $match => $query) {
@@ -820 +820 @@
         return $rules;
     }
-    
+
     //Add a straight rewrite rule
     function add_rule($regex, $redirect) {
@@ -832 +832 @@
         }
     }
-    
+
     //add a rule that doesn't redirect to index.php
     function add_external_rule($regex, $redirect) {
         $this->non_wp_rules[$regex] = $redirect;
     }
-    
+
     //add an endpoint, like /trackback/, to be inserted after certain URL types (specified in $places)
     function add_endpoint($name, $places) {