Changeset 5092

Timestamp:

03/23/2007 03:18:00 AM (19 years ago)

Author:

ryan

Message:

Big int patch for 2.1

Location:

branches/2.1

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/admin-db.php (modified) (6 diffs)
• wp-admin/admin-functions.php (modified) (5 diffs)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/import/blogware.php (modified) (1 diff)
• wp-admin/import/dotclear.php (modified) (1 diff)
• wp-admin/import/livejournal.php (modified) (1 diff)
• wp-admin/import/mt.php (modified) (2 diffs)
• wp-admin/import/wordpress.php (modified) (2 diffs)
• wp-includes/author-template.php (modified) (1 diff)
• wp-includes/bookmark-template.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (3 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/post.php (modified) (6 diffs)
• wp-includes/registration.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)
• wp-trackback.php (modified) (1 diff)
• xmlrpc.php (modified) (18 diffs)

branches/2.1/wp-admin/admin-ajax.php

@@ -232 +232 @@
                 $_POST['temp_ID'] = $_POST['post_ID'];
                 $id = wp_write_post();
-                if(is_wp_error($id))
+                if( is_wp_error($id) )
                         die($id->get_error_message());
                 else

branches/2.1/wp-admin/admin-db.php

@@ -124 +124 @@
         if (!$update) {
                 $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_description, category_parent, links_private, posts_private) VALUES ('0', '$cat_name', '$category_nicename', '$category_description', '$category_parent', '$links_private', '$posts_private')");
-                $cat_ID = $wpdb->insert_id;
+                $cat_ID = (int) $wpdb->insert_id;
         } else {
                 $wpdb->query ("UPDATE $wpdb->categories SET cat_name = '$cat_name', category_nicename = '$category_nicename', category_description = '$category_description', category_parent = '$category_parent', links_private = '$links_private', posts_private = '$posts_private' WHERE cat_ID = '$cat_ID'");
@@ -246 +246 @@
                 return 0;
 
-        return $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
+        return (int) $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_nicename'");
 }
 
@@ -299 +299 @@
         if ( !empty($link_id) )
                 $update = true;
+
+        $link_id = (int) $link_id;
 
         if( trim( $link_name ) == '' )
@@ -361 +363 @@
         } else {
                 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES('$link_url','$link_name', '$link_image', '$link_target', '$link_description', '$link_visible', '$link_owner', '$link_rating', '$link_rel', '$link_notes', '$link_rss')");
-                $link_id = $wpdb->insert_id;
+                $link_id = (int) $wpdb->insert_id;
         }
 
@@ -444 +446 @@
                 SELECT category_id
                 FROM $wpdb->link2cat
-                WHERE link_id = $link_ID");
+                WHERE link_id = '$link_ID'");
 
         if (!$old_categories) {
@@ -457 +459 @@
         if ($delete_cats) {
                 foreach ($delete_cats as $del) {
+                        $del = (int) $del;
                         $wpdb->query("
                                 DELETE FROM $wpdb->link2cat
-                                WHERE category_id = $del
-                                        AND link_id = $link_ID
+                                WHERE category_id = '$del'
+                                        AND link_id = '$link_ID'
                                 ");
                 }

branches/2.1/wp-admin/admin-functions.php

@@ -152 +152 @@
                         continue;
 
-                $id = $id_matches[3];
+                $id = (int) $id_matches[3];
 
                 // While we have the attachment ID, let's adopt any orphans.
@@ -436 +436 @@
         if ( func_num_args() ) { // The hackiest hack that ever did hack
                 global $current_user, $wp_roles;
-                $user_id = func_get_arg( 0 );
+                $user_id = (int) func_get_arg( 0 );
 
                 if ( isset( $_POST['role'] ) ) {
@@ -454 +454 @@
         if ( $user_id != 0 ) {
                 $update = true;
-                $user->ID = $user_id;
+                $user->ID = (int) $user_id;
                 $userdata = get_userdata( $user_id );
                 $user->user_login = $wpdb->escape( $userdata->user_login );
@@ -782 +782 @@
         if ( current_user_can( 'manage_categories' ) ) {
                 $edit = "<a href='categories.php?action=edit&amp;cat_ID=$category->cat_ID' class='edit'>".__( 'Edit' )."</a></td>";
-                $default_cat_id = get_option( 'default_category' );
-                $default_link_cat_id = get_option( 'default_link_category' );
+                $default_cat_id = (int) get_option( 'default_category' );
+                $default_link_cat_id = (int) get_option( 'default_link_category' );
 
                 if ( ($category->cat_ID != $default_cat_id ) && ($category->cat_ID != $default_link_cat_id ) )
@@ -822 +822 @@
                 $post->post_title = wp_specialchars( $post->post_title );
                 $pad = str_repeat( '&#8212; ', $level );
-                $id = $post->ID;
+                $id = (int) $post->ID;
                 $class = ('alternate' == $class ) ? '' : 'alternate';
 ?>

branches/2.1/wp-admin/edit-comments.php

@@ -57 +57 @@
         foreach ($_POST['delete_comments'] as $comment) : // Check the permissions on each
                 $comment = (int) $comment;
-                $post_id = $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
+                $post_id = (int) $wpdb->get_var("SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = $comment");
                 // $authordata = get_userdata( $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $post_id") );
                 if ( current_user_can('edit_post', $post_id) ) {

branches/2.1/wp-admin/import/blogware.php

@@ -105 +105 @@
 
                         if ( $comments ) {
-                                $comment_post_ID = $post_id;
+                                $comment_post_ID = (int) $post_id;
                                 $num_comments = 0;
                                 foreach ($comments as $comment) {

branches/2.1/wp-admin/import/dotclear.php

@@ -438 +438 @@
 
                                 // WordPressify Data
-                                $comment_ID = ltrim($comment_id, '0');
-                                $comment_post_ID = $postarr[$post_id];
+                                $comment_ID = (int) ltrim($comment_id, '0');
+                                $comment_post_ID = (int) $postarr[$post_id];
                                 $comment_approved = "$comment_pub";
                                 $name = $wpdb->escape(csc ($comment_auteur));

branches/2.1/wp-admin/import/livejournal.php

@@ -83 +83 @@
 
                         if ( $comments ) {
-                                $comment_post_ID = $post_id;
+                                $comment_post_ID = (int) $post_id;
                                 $num_comments = 0;
                                 foreach ($comments as $comment) {

branches/2.1/wp-admin/import/mt.php

@@ -172 +172 @@
                 }
                 $this->file = $file['file'];
-                $this->id = $file['id'];
+                $this->id = (int) $file['id'];
 
                 $this->get_entries();
@@ -296 +296 @@
                                 }
 
-                                $comment_post_ID = $post_id;
+                                $comment_post_ID = (int) $post_id;
                                 $comment_approved = 1;
 

branches/2.1/wp-admin/import/wordpress.php

@@ -175 +175 @@
                 }
                 $this->file = $file['file'];
-                $this->id = $file['id'];
+                $this->id = (int) $file['id'];
 
                 $this->get_entries();
@@ -202 +202 @@
                                 $category_parent = '0';
                         else
-                                $category_parent = (int) category_exists($parent);
+                                $category_parent = category_exists($parent);
 
                         $catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name');

branches/2.1/wp-includes/author-template.php

@@ -145 +145 @@
 function get_author_posts_url($author_id, $author_nicename = '') {
         global $wpdb, $wp_rewrite, $post, $cache_userdata;
-        $auth_ID = $author_id;
+        $auth_ID = (int) $author_id;
         $link = $wp_rewrite->get_author_permastruct();
 

branches/2.1/wp-includes/bookmark-template.php

@@ -166 +166 @@
                 return '';
 
-        $cat_id = $cats[0]; // Take the first cat.
+        $cat_id = (int) $cats[0]; // Take the first cat.
 
         $cat = get_category($cat_id);

branches/2.1/wp-includes/category-template.php

@@ -65 +65 @@
         $id = (int) $id;
         if ( !$id )
-                $id = $post->ID;
+                $id = (int) $post->ID;
 
         if ( !isset($category_cache[$blog_id][$id]) )

branches/2.1/wp-includes/comment-template.php

@@ -151 +151 @@
 
         if ( !$post_id )
-                $post_id = $id;
+                $post_id = (int) $id;
 
         $post = get_post($post_id);

branches/2.1/wp-includes/comment.php

@@ -346 +346 @@
         ");
 
-        $id = $wpdb->insert_id;
+        $id = (int) $wpdb->insert_id;
 
         if ( $comment_approved == 1)

branches/2.1/wp-includes/feed.php

@@ -109 +109 @@
 
 function get_author_rss_link($echo = false, $author_id, $author_nicename) {
-        $auth_ID = $author_id;
+        $auth_ID = (int) $author_id;
         $permalink_structure = get_option('permalink_structure');
 

branches/2.1/wp-includes/functions.php

@@ -567 +567 @@
         $count = count( $post_id_array);
         for ( $i = 0; $i < $count; $i++ ) {
-                $post_id = $post_id_array[ $i ];
+                $post_id = (int) $post_id_array[ $i ];
                 if ( isset( $category_cache[$blog_id][$post_id] ) ) {
                         unset( $post_id_array[ $i ] );
@@ -621 +621 @@
         $count = count( $post_id_array);
         for ( $i = 0; $i < $count; $i++ ) {
-                $post_id = $post_id_array[ $i ];
+                $post_id = (int) $post_id_array[ $i ];
                 if ( isset( $post_meta_cache[$blog_id][$post_id] ) ) { // If the meta is already cached
                         unset( $post_id_array[ $i ] );

branches/2.1/wp-includes/link-template.php

@@ -96 +96 @@
         $id = (int) $id;
         if ( !$id )
-                $id = $post->ID;
+                $id = (int) $post->ID;
 
         if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
@@ -111 +111 @@
 
         if ( !$id )
-                $id = $post->ID;
+                $id = (int) $post->ID;
 
         $pagestruct = $wp_rewrite->get_page_permastruct();
@@ -132 +132 @@
 
         if (! $id) {
-                $id = $post->ID;
+                $id = (int) $post->ID;
         }
 

branches/2.1/wp-includes/pluggable.php

@@ -474 +474 @@
 function wp_verify_nonce($nonce, $action = -1) {
         $user = wp_get_current_user();
-        $uid = $user->id;
+        $uid = (int) $user->id;
 
         $i = ceil(time() / 43200);
@@ -488 +488 @@
 function wp_create_nonce($action = -1) {
         $user = wp_get_current_user();
-        $uid = $user->id;
+        $uid = (int) $user->id;
 
         $i = ceil(time() / 43200);

branches/2.1/wp-includes/post.php

@@ -376 +376 @@
 
         if ( !$post_id )
-                $post_id = $id;
+                $post_id = (int) $id;
 
         $post_id = (int) $post_id;
@@ -540 +540 @@
         // Get the post ID.
         if ( $update )
-                $post_ID = $ID;
+                $post_ID = (int) $ID;
 
         // Create a valid post name.  Drafts are allowed to have an empty
@@ -644 +644 @@
                         VALUES
                         ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_content_filtered', '$post_title', '$post_excerpt', '$post_status', '$post_type', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_mime_type')");
-                        $post_ID = $wpdb->insert_id;
+                        $post_ID = (int) $wpdb->insert_id;
         }
 
@@ -1255 +1255 @@
         if ( !empty($ID) ) {
                 $update = true;
-                $post_ID = $ID;
+                $post_ID = (int) $ID;
         }
 
@@ -1350 +1350 @@
                         VALUES
                         ('$post_author', '$post_date', '$post_date_gmt', '$post_content', '$post_content_filtered', '$post_title', '$post_excerpt', '$post_status', '$post_type', '$comment_status', '$ping_status', '$post_password', '$post_name', '$to_ping', '$pinged', '$post_date', '$post_date_gmt', '$post_parent', '$menu_order', '$post_mime_type', '$guid')");
-                        $post_ID = $wpdb->insert_id;
+                        $post_ID = (int) $wpdb->insert_id;
         }
 
@@ -1505 +1505 @@
                 if ( !$post =& get_post( $mime ) )
                         return false;
-                $post_id = $post->ID;
+                $post_id = (int) $post->ID;
                 $mime = $post->post_mime_type;
         }

branches/2.1/wp-includes/registration.php

@@ -90 +90 @@
                 $query = apply_filters('update_user_query', $query);
                 $wpdb->query( $query );
-                $user_id = $ID;
+                $user_id = (int) $ID;
         } else {
                 $query = "INSERT INTO $wpdb->users
@@ -98 +98 @@
                 $query = apply_filters('create_user_query', $query);
                 $wpdb->query( $query );
-                $user_id = $wpdb->insert_id;
+                $user_id = (int) $wpdb->insert_id;
         }
 

branches/2.1/wp-includes/theme.php

@@ -346 +346 @@
         global $wp_query;
 
-        $id = $wp_query->post->ID;
+        $id = (int) $wp_query->post->ID;
         $template = get_post_meta($id, '_wp_page_template', true);
 

branches/2.1/wp-includes/user.php

@@ -162 +162 @@
         $userdata = $user->data;
         $user_login     = $user->user_login;
-        $user_level     = $user->user_level;
-        $user_ID        = $user->ID;
+        $user_level     = (int) $user->user_level;
+        $user_ID        = (int) $user->ID;
         $user_email     = $user->user_email;
         $user_url       = $user->user_url;

branches/2.1/wp-trackback.php

@@ -85 +85 @@
         }
 
-        $comment_post_ID = $tb_id;
+        $comment_post_ID = (int) $tb_id;
         $comment_author = $blog_name;
         $comment_author_email = '';

branches/2.1/xmlrpc.php

@@ -210 +210 @@
                 $this->escape($args);
 
-                $post_ID    = $args[1];
+                $post_ID    = (int) $args[1];
                 $user_login = $args[2];
                 $user_pass  = $args[3];
@@ -245 +245 @@
                 $this->escape($args);
 
-                $blog_ID    = $args[1]; /* though we don't use it yet */
+                $blog_ID    = (int) $args[1]; /* though we don't use it yet */
                 $user_login = $args[2];
                 $user_pass  = $args[3];
@@ -293 +293 @@
                 $this->escape($args);
 
-          $blog_ID    = $args[1];
+          $blog_ID    = (int) $args[1];
           $user_login = $args[2];
           $user_pass  = $args[3];
@@ -327 +327 @@
                 $this->escape($args);
 
-          $blog_ID    = $args[1];
+          $blog_ID    = (int) $args[1];
           $user_login = $args[2];
           $user_pass  = $args[3];
@@ -364 +364 @@
                 $this->escape($args);
 
-          $blog_ID    = $args[1]; /* though we don't use it yet */
+          $blog_ID    = (int) $args[1]; /* though we don't use it yet */
           $user_login = $args[2];
           $user_pass  = $args[3];
@@ -463 +463 @@
                 $this->escape($args);
 
-          $post_ID     = $args[1];
+          $post_ID     = (int) $args[1];
           $user_login  = $args[2];
           $user_pass   = $args[3];
@@ -504 +504 @@
                 $this->escape($args);
 
-          $blog_ID     = $args[0]; // we will support this in the near future
+          $blog_ID     = (int) $args[0]; // we will support this in the near future
           $user_login  = $args[1];
           $user_pass   = $args[2];
@@ -688 +688 @@
                 $this->escape($args);
 
-          $post_ID     = $args[0];
+          $post_ID     = (int) $args[0];
           $user_login  = $args[1];
           $user_pass   = $args[2];
@@ -743 +743 @@
                 $this->escape($args);
 
-                $blog_ID     = $args[0];
+                $blog_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
-                $num_posts   = $args[3];
+                $num_posts   = (int) $args[3];
 
                 if (!$this->login_pass_ok($user_login, $user_pass)) {
@@ -809 +809 @@
                 $this->escape($args);
 
-                $blog_ID     = $args[0];
+                $blog_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
@@ -843 +843 @@
                 global $wpdb;
 
-                $blog_ID     = $wpdb->escape($args[0]);
+                $blog_ID     = (int) $args[0];
                 $user_login  = $wpdb->escape($args[1]);
                 $user_pass   = $wpdb->escape($args[2]);
@@ -901 +901 @@
                 $this->escape($args);
 
-                $blog_ID     = $args[0];
+                $blog_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
-                $num_posts   = $args[3];
+                $num_posts   = (int) $args[3];
 
                 if (!$this->login_pass_ok($user_login, $user_pass)) {
@@ -946 +946 @@
                 $this->escape($args);
 
-                $blog_ID     = $args[0];
+                $blog_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
@@ -975 +975 @@
                 $this->escape($args);
 
-                $post_ID     = $args[0];
+                $post_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
@@ -1005 +1005 @@
                 $this->escape($args);
 
-                $post_ID     = $args[0];
+                $post_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
@@ -1088 +1088 @@
                 $this->escape($args);
 
-                $post_ID     = $args[0];
+                $post_ID     = (int) $args[0];
                 $user_login  = $args[1];
                 $user_pass   = $args[2];
@@ -1150 +1150 @@
                         // the path defines the post_ID (archives/p/XXXX)
                         $blah = explode('/', $match[0]);
-                        $post_ID = $blah[1];
+                        $post_ID = (int) $blah[1];
                         $way = 'from the path';
                 } elseif (preg_match('#p=[0-9]{1,}#', $urltest['query'], $match)) {
                         // the querystring defines the post_ID (?p=XXXX)
                         $blah = explode('=', $match[0]);
-                        $post_ID = $blah[1];
+                        $post_ID = (int) $blah[1];
                         $way = 'from the querystring';
                 } elseif (isset($urltest['fragment'])) {
@@ -1161 +1161 @@
                         if (intval($urltest['fragment'])) {
                                 // ...an integer #XXXX (simpliest case)
-                                $post_ID = $urltest['fragment'];
+                                $post_ID = (int) $urltest['fragment'];
                                 $way = 'from the fragment (numeric)';
                         } elseif (preg_match('/post-[0-9]+/',$urltest['fragment'])) {