Changeset 3517 for trunk/wp-includes/classes.php

Timestamp:

02/12/2006 07:53:23 AM (21 years ago)

Author:

ryan

Message:

Death to trailing tabs. Props Mark J. fixes #2405

File:

• trunk/wp-includes/classes.php (modified) (26 diffs)

trunk/wp-includes/classes.php

@@ -54 +54 @@
                 $this->is_attachment = false;
         }
-        
+
         function init () {
                 unset($this->posts);
@@ -64 +64 @@
                 $this->current_post = -1;
                 $this->in_the_loop = false;
-                
+
                 $this->init_query_flags();
         }
@@ -98 +98 @@
                 if ( '' != $qv['subpost_id'] )
                         $qv['attachment_id'] = $qv['subpost_id'];
-                        
+
                 if ( ('' != $qv['attachment']) || (int) $qv['attachment_id'] ) {
                         $this->is_single = true;
@@ -227 +227 @@
                         $this->is_comments_popup = true;
                 }
-                
+
                 //if we're previewing inside the write screen
                 if ('' != $qv['preview']) {
@@ -248 +248 @@
         function set_404() {
                 $this->init_query_flags();
-                $this->is_404 = true;   
-        }
-        
+                $this->is_404 = true;
+        }
+
         function get($query_var) {
                 if (isset($this->query_vars[$query_var])) {
@@ -269 +269 @@
 
                 // Shorthand.
-                $q = $this->query_vars; 
+                $q = $this->query_vars;
 
                 // First let's clear some variables
@@ -307 +307 @@
                         $q['page'] = (int) $q['page'];
                 }
-        
+
                 $add_hours = intval(get_settings('gmt_offset'));
                 $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
@@ -373 +373 @@
                         $q['pagename'] = sanitize_title(basename($page_paths));
                         $q['name'] = $q['pagename'];
-                        
+
                         $where .= " AND (ID = '$reqpage')";
                 } elseif ('' != $q['attachment']) {
@@ -490 +490 @@
                                 }
                         }
-                        
+
                         //if we don't match the entire hierarchy fallback on just matching the nicename
                         if (!$q['cat'] && $partial_match) {
                                 $q['cat'] = $partial_match;
-                        }                       
+                        }
 
                         $tables = ", $wpdb->post2cat, $wpdb->categories";
@@ -542 +542 @@
                         $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
                 }
-                
+
                 $where .= $search.$whichcat.$whichauthor;
 
@@ -598 +598 @@
                                 $where .= " OR post_author = $user_ID AND post_status = 'private')";
                         else
-                                $where .= ')';                          
+                                $where .= ')';
                 }
 
@@ -681 +681 @@
                         $this->post = $this->posts[0];
                 }
-                
+
                 // Save any changes made to the query vars.
                 $this->query_vars = $q;
@@ -842 +842 @@
 
                 $foot .= '<p><a href="options-discussion.php">' . __('&laquo; Return to Discussion Options page.') . '</a></p></div>';
-                
+
                 return $head . $body . $foot;
         }       // End function display_edit_form
@@ -923 +923 @@
                 else
                         return true;
-        }                                       
+        }
 
         function using_index_permalinks() {
@@ -943 +943 @@
                 else
                         return false;
-        }                                       
+        }
 
         function preg_index($number) {
@@ -988 +988 @@
                         return false;
                 }
-                
+
                 // The date permalink must have year, month, and day separated by slashes.
                 $endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%');
@@ -1071 +1071 @@
 
                 $this->category_structure .= '%category%';
-                
+
                 return $this->category_structure;
         }
@@ -1154 +1154 @@
                 // that tag, otherwise add the new tag, pattern, and query to the end of
                 // the arrays.
-                $position = array_search($tag, $this->rewritecode);             
+                $position = array_search($tag, $this->rewritecode);
                 if (FALSE !== $position && NULL !== $position) {
                         $this->rewritereplace[$position] = $pattern;
-                        $this->queryreplace[$position] = $query;                        
+                        $this->queryreplace[$position] = $query;
                 } else {
                         $this->rewritecode[] = $tag;
@@ -1175 +1175 @@
                 $trackbackregex = 'trackback/?$';
                 $pageregex = 'page/?([0-9]{1,})/?$';
-                
+
                 $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
                 preg_match_all('/%.+?%/', $permalink_structure, $tokens);
@@ -1305 +1305 @@
                 $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct());
                 $date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
-                
+
                 // Root
                 $root_rewrite = $this->generate_rewrite_rules($this->root . '/');
@@ -1373 +1373 @@
                                 "RewriteCond %{REQUEST_FILENAME} -d\n" .
                                 "RewriteRule ^.*$ - [S=$num_rules]\n";
-                
+
                         foreach ($rewrite as $match => $query) {
                                 // Apache 1.3 does not support the reluctant (non-greedy) modifier.
@@ -1383 +1383 @@
                                         //nada.
                                 }
-                        
+
                                 if (strstr($query, $this->index)) {
                                         $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
@@ -1414 +1414 @@
         function init() {
                 $this->permalink_structure = get_settings('permalink_structure');
-                $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));          
+                $this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
                 $this->root = '';
                 if ($this->using_index_permalinks()) {
@@ -1494 +1494 @@
                         // front.  For path info requests, this leaves us with the requesting
                         // filename, if any.  For 404 requests, this leaves us with the
-                        // requested permalink. 
+                        // requested permalink.
                         $req_uri = str_replace($pathinfo, '', $req_uri);
                         $req_uri = trim($req_uri, '/');
@@ -1563 +1563 @@
                                 if (isset($error))
                                         unset($error);
-                                        
+
                                 if ( isset($query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') )
                                         unset($query_vars);
-                                        
+
                                 $this->did_permalink = false;
                         }
@@ -1620 +1620 @@
                         $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
 
-                        // Make a timestamp for our most recent modification... 
+                        // Make a timestamp for our most recent modification...
                         $wp_modified_timestamp = strtotime($wp_last_modified);