Changeset 4495 for trunk/wp-includes/classes.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/classes.php (modified) (21 diffs)

trunk/wp-includes/classes.php

@@ -13 +13 @@
     var $matched_query;
     var $did_permalink = false;
-    
+
     function add_query_var($qv) {
         $this->public_query_vars[] = $qv;
@@ -97 +97 @@
                     // Got a match.
                     $this->matched_rule = $match;
-                    
+
                     // Trim the query of everything up to the '?'.
                     $query = preg_replace("!^.+\?!", '', $query);
@@ -191 +191 @@
             )
                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
-            else 
+            else
                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
             $wp_etag = '"' . md5($wp_last_modified) . '"';
@@ -198 +198 @@
 
             // Support for Conditional GET
-            if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) 
+            if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
                 $client_etag = stripslashes(stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
             else $client_etag = false;
@@ -322 +322 @@
             return '';
 
-        return $codes[0];   
+        return $codes[0];
     }
 
@@ -338 +338 @@
             return $this->errors[$code];
         else
-            return array(); 
+            return array();
     }
 
@@ -382 +382 @@
 // A class for displaying various tree-like structures. Extend the Walker class to use it, see examples at the bottom
 
-class Walker {  
+class Walker {
     var $tree_type;
     var $db_fields;
-    
+
     //abstract callbacks
     function start_lvl($output) { return $output; }
@@ -391 +391 @@
     function start_el($output)  { return $output; }
     function end_el($output)    { return $output; }
-    
+
     function walk($elements, $to_depth) {
         $args = array_slice(func_get_args(), 2); $parents = array(); $depth = 1; $previous_element = ''; $output = '';
-    
+
         //padding at the end
         $last_element->post_parent = 0;
         $last_element->post_id = 0;
         $elements[] = $last_element;
-    
+
         $id_field = $this->db_fields['id'];
         $parent_field = $this->db_fields['parent'];
-    
+
         $flat = ($to_depth == -1) ? true : false;
-    
+
         foreach ( $elements as $element ) {
             // If flat, start and end the element and skip the level checks.
@@ -444 +444 @@
                     $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
                 }
-    
+
                 while ( $parent = array_shift($parents) ) {
                     $depth--;
@@ -464 +464 @@
                 }
             }
-    
+
             // Start the element.
             if ( !$to_depth || ($depth <= $to_depth) ) {
@@ -472 +472 @@
                 }
             }
-    
+
             $previous_element = $element;
         }
-        
+
         return $output;
     }
@@ -483 +483 @@
     var $tree_type = 'page';
     var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID'); //TODO: decouple this
-    
+
     function start_lvl($output, $depth) {
         $indent = str_repeat("\t", $depth);
@@ -489 +489 @@
         return $output;
     }
-    
+
     function end_lvl($output, $depth) {
         $indent = str_repeat("\t", $depth);
@@ -495 +495 @@
         return $output;
     }
-    
+
     function start_el($output, $page, $depth, $current_page, $show_date, $date_format) {
         if ( $depth )
@@ -531 +531 @@
 
     function start_el($output, $page, $depth, $args) {
-        $pad = str_repeat('&nbsp;', $depth * 3);
-
-        $output .= "\t<option value=\"$page->ID\"";
-        if ( $page->ID == $args['selected'] )
-                $output .= ' selected="selected"';
-        $output .= '>';
-        $title = wp_specialchars($page->post_title);
-        $output .= "$pad$title";
-        $output .= "</option>\n";
-
-        return $output;
+                $pad = str_repeat('&nbsp;', $depth * 3);
+
+                $output .= "\t<option value=\"$page->ID\"";
+                if ( $page->ID == $args['selected'] )
+                                $output .= ' selected="selected"';
+                $output .= '>';
+                $title = wp_specialchars($page->post_title);
+                $output .= "$pad$title";
+                $output .= "</option>\n";
+
+                return $output;
     }
 }
@@ -548 +548 @@
     var $tree_type = 'category';
     var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
-    
+
     function start_lvl($output, $depth, $args) {
         if ( 'list' != $args['style'] )
             return $output;
-    
+
         $indent = str_repeat("\t", $depth);
         $output .= "$indent<ul class='children'>\n";
         return $output;
     }
-    
+
     function end_lvl($output, $depth, $args) {
         if ( 'list' != $args['style'] )
             return $output;
-    
+
         $indent = str_repeat("\t", $depth);
         $output .= "$indent</ul>\n";
         return $output;
     }
-    
+
     function start_el($output, $category, $depth, $args) {
         extract($args);
-    
+
         $link = '<a href="' . get_category_link($category->cat_ID) . '" ';
         if ( $use_desc_for_title == 0 || empty($category->category_description) )
@@ -577 +577 @@
         $link .= '>';
         $link .= apply_filters('list_cats', $category->cat_name, $category).'</a>';
-    
+
         if ( (! empty($feed_image)) || (! empty($feed)) ) {
             $link .= ' ';
-    
+
             if ( empty($feed_image) )
                 $link .= '(';
-    
+
             $link .= '<a href="' . get_category_rss_link(0, $category->cat_ID, $category->category_nicename) . '"';
-    
+
             if ( !empty($feed) ) {
                 $title = ' title="' . $feed . '"';
@@ -592 +592 @@
                 $link .= $title;
             }
-    
+
             $link .= '>';
-    
+
             if ( !empty($feed_image) )
                 $link .= "<img src='$feed_image' $alt$title" . ' />';
@@ -619 +619 @@
             $output .= "\t$link<br />\n";
         }
-    
-        return $output;
-    }
-    
+
+        return $output;
+    }
+
     function end_el($output, $page, $depth, $args) {
         if ( 'list' != $args['style'] )
             return $output;
-    
+
         $output .= "</li>\n";
         return $output;
@@ -636 +636 @@
     var $tree_type = 'category';
     var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
-    
-    function start_el($output, $category, $depth, $args) { 
+
+    function start_el($output, $category, $depth, $args) {
         $pad = str_repeat('&nbsp;', $depth * 3);
-        
+
         $cat_name = apply_filters('list_cats', $category->cat_name, $category);
         $output .= "\t<option value=\"".$category->cat_ID."\"";
@@ -653 +653 @@
         }
         $output .= "</option>\n";
-        
+
         return $output;
     }