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

trunk/wp-includes/deprecated.php

@@ -130 +130 @@
 
     if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' &&  $author_data->user_level < 2))
-         || ($author_data->user_level > $post_author_data->user_level)
-         || ($author_data->user_level >= 10) ) {
+             || ($author_data->user_level > $post_author_data->user_level)
+             || ($author_data->user_level >= 10) ) {
         return true;
     } else {
@@ -200 +200 @@
  */
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />',
-                         $between = " ", $show_images = true, $orderby = 'id',
-                         $show_description = true, $show_rating = false,
-                         $limit = -1, $show_updated = 0) {
-    global $wpdb;
-    $cat_id = -1;
-    $results = $wpdb->get_results("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");
-    if ($results) {
-        foreach ($results as $result) {
-            $cat_id = $result->cat_ID;
-        }
-    }
-    get_links($cat_id, $before, $after, $between, $show_images, $orderby,
-              $show_description, $show_rating, $limit, $show_updated);
+                                                 $between = " ", $show_images = true, $orderby = 'id',
+                                                 $show_description = true, $show_rating = false,
+                                                 $limit = -1, $show_updated = 0) {
+        global $wpdb;
+        $cat_id = -1;
+        $results = $wpdb->get_results("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$cat_name'");
+        if ($results) {
+                foreach ($results as $result) {
+                        $cat_id = $result->cat_ID;
+                }
+        }
+        get_links($cat_id, $before, $after, $between, $show_images, $orderby,
+                            $show_description, $show_rating, $limit, $show_updated);
 }
 
@@ -253 +253 @@
 // Deprecate in favor of get_linkz().
 function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-    global $wpdb;
-    $cat_id = -1;
-    //$results = $wpdb->get_results("SELECT cat_id FROM $wpdb->linkcategories WHERE cat_name='$cat_name'");
-    // TODO: Fix me.
-    if ($results) {
-        foreach ($results as $result) {
-            $cat_id = $result->cat_id;
-        }
-    }
-    return get_linkobjects($cat_id, $orderby, $limit);
+        global $wpdb;
+        $cat_id = -1;
+        //$results = $wpdb->get_results("SELECT cat_id FROM $wpdb->linkcategories WHERE cat_name='$cat_name'");
+        // TODO: Fix me.
+        if ($results) {
+                foreach ($results as $result) {
+                        $cat_id = $result->cat_id;
+                }
+        }
+        return get_linkobjects($cat_id, $orderby, $limit);
 }
 
@@ -302 +302 @@
 // Deprecate in favor of get_linkz().
 function get_linkobjects($category = -1, $orderby = 'name', $limit = -1) {
-    global $wpdb;
-
-    $sql = "SELECT * FROM $wpdb->links WHERE link_visible = 'Y'";
-    if ($category != -1) {
-        $sql .= " AND link_category = $category ";
-    }
-    if ($orderby == '')
-        $orderby = 'id';
-    if (substr($orderby,0,1) == '_') {
-        $direction = ' DESC';
-        $orderby = substr($orderby,1);
-    }
-    if (strcasecmp('rand',$orderby) == 0) {
-        $orderby = 'rand()';
-    } else {
-        $orderby = " link_" . $orderby;
-    }
-    $sql .= ' ORDER BY ' . $orderby;
-    $sql .= $direction;
-    /* The next 2 lines implement LIMIT TO processing */
-    if ($limit != -1)
-        $sql .= " LIMIT $limit";
-
-    $results = $wpdb->get_results($sql);
-    if ($results) {
-        foreach ($results as $result) {
-            $result->link_url         = $result->link_url;
-            $result->link_name        = $result->link_name;
-            $result->link_description = $result->link_description;
-            $result->link_notes       = $result->link_notes;
-            $newresults[] = $result;
-        }
-    }
-    return $newresults;
+        global $wpdb;
+
+        $sql = "SELECT * FROM $wpdb->links WHERE link_visible = 'Y'";
+        if ($category != -1) {
+                $sql .= " AND link_category = $category ";
+        }
+        if ($orderby == '')
+                $orderby = 'id';
+        if (substr($orderby,0,1) == '_') {
+                $direction = ' DESC';
+                $orderby = substr($orderby,1);
+        }
+        if (strcasecmp('rand',$orderby) == 0) {
+                $orderby = 'rand()';
+        } else {
+                $orderby = " link_" . $orderby;
+        }
+        $sql .= ' ORDER BY ' . $orderby;
+        $sql .= $direction;
+        /* The next 2 lines implement LIMIT TO processing */
+        if ($limit != -1)
+                $sql .= " LIMIT $limit";
+
+        $results = $wpdb->get_results($sql);
+        if ($results) {
+                foreach ($results as $result) {
+                        $result->link_url         = $result->link_url;
+                        $result->link_name        = $result->link_name;
+                        $result->link_description = $result->link_description;
+                        $result->link_notes       = $result->link_notes;
+                        $newresults[] = $result;
+                }
+        }
+        return $newresults;
 }
 
@@ -360 +360 @@
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '',
-                                    $after = '<br />', $between = " ",
-                                    $show_images = true, $orderby = 'id',
-                                    $show_description = true, $limit = -1, $show_updated = 0) {
-
-    get_linksbyname($cat_name, $before, $after, $between, $show_images,
-                    $orderby, $show_description, true, $limit, $show_updated);
+                                                                        $after = '<br />', $between = " ",
+                                                                        $show_images = true, $orderby = 'id',
+                                                                        $show_description = true, $limit = -1, $show_updated = 0) {
+
+        get_linksbyname($cat_name, $before, $after, $between, $show_images,
+                                        $orderby, $show_description, true, $limit, $show_updated);
 }
 
@@ -390 +390 @@
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />',
-                              $between = " ", $show_images = true,
-                              $orderby = 'id', $show_description = true,
-                              $limit = -1, $show_updated = 0) {
-
-    get_links($category, $before, $after, $between, $show_images, $orderby,
-              $show_description, true, $limit, $show_updated);
+                                                            $between = " ", $show_images = true,
+                                                            $orderby = 'id', $show_description = true,
+                                                            $limit = -1, $show_updated = 0) {
+
+        get_links($category, $before, $after, $between, $show_images, $orderby,
+                            $show_description, true, $limit, $show_updated);
 }
 
@@ -404 +404 @@
  */
 function get_autotoggle($id = 0) {
-    return 0;  
+    return 0;
 }
 
@@ -434 +434 @@
     $r['title_li'] = '';
 
-    return wp_list_categories($r);  
+    return wp_list_categories($r);
 }