Changeset 6363

Timestamp:

12/06/2007 06:37:30 AM (17 years ago)

Author:

ryan

Message:

Remove unused variables. Props DD32. see #5418

Location:

trunk/wp-admin

Files:

• custom-header.php (modified) (1 diff)
• edit-link-form.php (modified) (1 diff)
• includes/bookmark.php (modified) (1 diff)
• includes/image.php (modified) (1 diff)
• includes/schema.php (modified) (1 diff)
• includes/taxonomy.php (modified) (4 diffs)
• includes/template.php (modified) (6 diffs)
• includes/upgrade.php (modified) (1 diff)
• includes/upload.php (modified) (1 diff)
• install-helper.php (modified) (3 diffs)

trunk/wp-admin/custom-header.php

@@ -229 +229 @@
         if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) {
             set_theme_mod('header_image', clean_url($url));
-            $header = apply_filters('wp_create_file_in_uploads', $file, $id); // For replication
+            apply_filters('wp_create_file_in_uploads', $file, $id); // For replication
             return $this->finished();
         } elseif ( $width > HEADER_IMAGE_WIDTH ) {

trunk/wp-admin/edit-link-form.php

@@ -12 +12 @@
 }
 
-function xfn_check($class, $value = '', $depreciated = null) {
+function xfn_check($class, $value = '', $deprecated = '') {
     global $link;
 

trunk/wp-admin/includes/bookmark.php

@@ -152 +152 @@
 
 function wp_update_link($linkdata) {
-    global $wpdb;
-
     $link_id = (int) $linkdata['link_id'];
 

trunk/wp-admin/includes/image.php

@@ -17 +17 @@
  * If PHP does not have the functionality to save in a file of the same format, the thumbnail will be created as a jpeg.
  */
-function wp_create_thumbnail( $file, $max_side, $depreciated = '' ) {
+function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
     if ( ctype_digit( $file ) ) // Handle int as attachment ID
         $file = get_attached_file( $file );

trunk/wp-admin/includes/schema.php

@@ -255 +255 @@
 
 function populate_roles_160() {
-    global $wp_roles;
-
     // Add roles
     add_role('administrator', _c('Administrator|User role'));

trunk/wp-admin/includes/taxonomy.php

@@ -41 +41 @@
 
 function wp_delete_category($cat_ID) {
-    global $wpdb;
-
     $cat_ID = (int) $cat_ID;
     $default = get_option('default_category');
@@ -54 +52 @@
 
 function wp_insert_category($catarr, $wp_error = false) {
-    global $wpdb;
-
     extract($catarr, EXTR_SKIP);
 
@@ -96 +92 @@
 
 function wp_update_category($catarr) {
-    global $wpdb;
-
     $cat_ID = (int) $catarr['cat_ID'];
 
@@ -120 +114 @@
 
 function get_tags_to_edit( $post_id ) {
-    global $wpdb;
-
     $post_id = (int) $post_id;
     if ( !$post_id )

trunk/wp-admin/includes/template.php

@@ -125 +125 @@
 
 function get_nested_categories( $default = 0, $parent = 0 ) {
-    global $post_ID, $wpdb, $checked_categories;
+    global $post_ID, $checked_categories;
 
     if ( empty($checked_categories) ) {
@@ -227 +227 @@
 
 function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) {
-    global $wpdb, $class, $post;
+    global $class, $post;
 
     if (!$pages )
@@ -258 +258 @@
 
 <?php
-        if ( $hierarchy ) page_rows( $id, $level + 1, $pages );
+        if ( $hierarchy )
+            page_rows( $id, $level + 1, $pages );
     }
 }
@@ -323 +324 @@
 
 function _wp_comment_list_item( $id, $alt = 0 ) {
-    global $authordata, $comment, $wpdb;
+    global $authordata, $comment;
     $comment =& get_comment( $id );
     $id = (int) $comment->comment_ID;
@@ -368 +369 @@
 
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-    global $wpdb;
     if (!$categories )
         $categories = get_categories( 'hide_empty=0' );
@@ -441 +441 @@
     $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
     $r .= "class='delete:the-list:meta-{$entry['meta_id']} deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' />";
-    $r .= "<input type='hidden' name='_ajax_nonce' value='$nonce' />";
     $r .= "</td>\n\t</tr>";
     return $r;

trunk/wp-admin/includes/upgrade.php

@@ -7 +7 @@
 
 if ( !function_exists('wp_install') ) :
-function wp_install($blog_title, $user_name, $user_email, $public, $meta='') {
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
     global $wp_rewrite;
 

trunk/wp-admin/includes/upload.php

@@ -79 +79 @@
 
 function wp_upload_view() {
-    global $style, $style;
+    global $style;
     $id = get_the_ID();
     $attachment_data = wp_get_attachment_metadata( $id );

trunk/wp-admin/install-helper.php

@@ -17 +17 @@
     }
     //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
+    $wpdb->query($create_ddl);
     // we cannot directly tell that whether this succeeded!
     foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
@@ -42 +42 @@
     }
     //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
+    $wpdb->query($create_ddl);
     // we cannot directly tell that whether this succeeded!
     foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
@@ -64 +64 @@
         if ($column == $column_name) {
             //found it try to drop it.
-            $q = $wpdb->query($drop_ddl);
+            $wpdb->query($drop_ddl);
             // we cannot directly tell that whether this succeeded!
             foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {