diff --git a/app.php b/app.php index 08fd3d1061..ba0dada684 100644 --- a/app.php +++ b/app.php @@ -417,9 +417,9 @@ EOD; if(!current_user_can($cap)) $this->auth_required('Sorry, you do not have the right to edit/publish new posts.'); - $blog_ID = $current_blog->blog_id; + $blog_ID = (int )$current_blog->blog_id; $post_status = ($publish) ? 'publish' : 'draft'; - $post_author = $user->ID; + $post_author = (int) $user->ID; $post_title = $entry->title; $post_content = $entry->content; $post_excerpt = $entry->summary; @@ -430,7 +430,7 @@ EOD; log_app('Inserting Post. Data:', print_r($post_data,true)); - $postID = wp_insert_post($post_data); + $postID = (int) wp_insert_post($post_data); if (!$postID) { $this->internal_error('Sorry, your entry could not be posted. Something wrong happened.'); @@ -582,7 +582,7 @@ EOD; ); // Save the data - $postID = wp_insert_attachment($attachment, $file, $post); + $postID = (int) wp_insert_attachment($attachment, $file, $post); if (!$postID) { $this->internal_error('Sorry, your entry could not be posted. Something wrong happened.'); @@ -788,7 +788,7 @@ EOD; global $use_querystring; if(!isset($postID)) { global $post; - $postID = $GLOBALS['post']->ID; + $postID = (int) $GLOBALS['post']->ID; } if ($use_querystring) { @@ -810,7 +810,7 @@ EOD; global $use_querystring; if(!isset($postID)) { global $post; - $postID = $GLOBALS['post']->ID; + $postID = (int) $GLOBALS['post']->ID; } if ($use_querystring) { @@ -885,7 +885,7 @@ EOD; $wp = $GLOBALS['wp']; $wp_query = $GLOBALS['wp_query']; $wpdb = $GLOBALS['wpdb']; - $blog_id = $GLOBALS['blog_id']; + $blog_id = (int) $GLOBALS['blog_id']; $post_cache = $GLOBALS['post_cache']; diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index d3103d87f8..bd28c6904e 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -115,8 +115,8 @@ case 'add-category' : // On the Fly $cat_name = trim($cat_name); if ( !$category_nicename = sanitize_title($cat_name) ) die('0'); - if ( !$cat_id = category_exists( $cat_name ) ) - $cat_id = wp_create_category( $cat_name ); + if ( !$cat_id = (int) category_exists( $cat_name ) ) + $cat_id = (int) wp_create_category( $cat_name ); $cat_name = wp_specialchars(stripslashes($cat_name)); $x->add( array( 'what' => 'category', @@ -156,13 +156,13 @@ case 'add-meta' : die('-1'); if ( $id < 0 ) { $now = current_time('timestamp', 1); - if ( $pid = wp_insert_post( array( + if ( $pid = (int) wp_insert_post( array( 'post_title' => sprintf('Draft created on %s at %s', date(get_option('date_format'), $now), date(get_option('time_format'), $now)) ) ) ) - $mid = add_meta( $pid ); + $mid = (int) add_meta( $pid ); else die('0'); - } else if ( !$mid = add_meta( $id ) ) { + } else if ( !$mid = (int) add_meta( $id ) ) { die('0'); } @@ -204,7 +204,7 @@ case 'add-user' : if ( !current_user_can('edit_users') ) die('-1'); require_once(ABSPATH . WPINC . '/registration.php'); - if ( !$user_id = add_user() ) + if ( !$user_id = (int) add_user() ) die('0'); elseif ( is_wp_error( $user_id ) ) { foreach( $user_id->get_error_messages() as $message ) @@ -230,7 +230,7 @@ case 'autosave' : // The name of this action is hardcoded in edit_post() if($_POST['post_ID'] < 0) { $_POST['temp_ID'] = $_POST['post_ID']; - $id = wp_write_post(); + $id = (int) wp_write_post(); if(is_wp_error($id)) die($id->get_error_message()); else diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php index e18d864720..dd6031ecb1 100644 --- a/wp-admin/admin-db.php +++ b/wp-admin/admin-db.php @@ -123,7 +123,7 @@ function wp_insert_category($catarr) { 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'"); } @@ -360,7 +360,7 @@ function wp_insert_link($linkdata) { WHERE link_id='$link_id'"); } 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; } wp_set_link_cats($link_id, $link_category); diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index b9a2cb8ce6..c2e738bb5f 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -114,7 +114,7 @@ function wp_write_post() { // Reunite any orphaned attachments with their parent if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) $draft_ids = array(); - if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) ) + if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) ) relocate_children( $draft_temp_id, $post_ID ); if ( $temp_id && $temp_id != $draft_temp_id ) relocate_children( $temp_id, $post_ID ); @@ -157,7 +157,7 @@ function fix_attachment_links( $post_ID ) { if ( 0 == preg_match( $search, $anchor, $id_matches ) ) continue; - $id = $id_matches[3]; + $id = (int) $id_matches[3]; // While we have the attachment ID, let's adopt any orphans. $attachment = & get_post( $id, ARRAY_A ); @@ -290,7 +290,7 @@ function edit_post() { // Reunite any orphaned attachments with their parent if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) ) $draft_ids = array(); - if ( $draft_temp_id = array_search( $post_ID, $draft_ids ) ) + if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) ) relocate_children( $draft_temp_id, $post_ID ); // Now that we have an ID we can fix any attachment anchor hrefs @@ -447,7 +447,7 @@ function get_user_to_edit( $user_id ) { function add_user() { 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'] ) ) { if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' ) ) { @@ -465,7 +465,7 @@ function edit_user( $user_id = 0 ) { global $current_user, $wp_roles, $wpdb; 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 ); } else { @@ -562,9 +562,9 @@ function edit_user( $user_id = 0 ) { return $errors; if ( $update ) { - $user_id = wp_update_user( get_object_vars( $user )); + $user_id = (int) wp_update_user( get_object_vars( $user )); } else { - $user_id = wp_insert_user( get_object_vars( $user )); + $user_id = (int) wp_insert_user( get_object_vars( $user )); wp_new_user_notification( $user_id ); } return $user_id; @@ -793,8 +793,8 @@ function _cat_row( $category, $level, $name_override = false ) { $pad = str_repeat( '— ', $level ); if ( current_user_can( 'manage_categories' ) ) { $edit = "".__( 'Edit' ).""; - $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 ) ) $edit .= "cat_ID ) . "' onclick=\"return deleteSomething( 'cat', $category->cat_ID, '" . js_escape(sprintf( __("You are about to delete the category '%s'.\nAll posts that were only assigned to this category will be assigned to the '%s' category.\nAll links that were only assigned to this category will be assigned to the '%s' category.\n'OK' to delete, 'Cancel' to stop." ), $category->cat_name, get_catname( $default_cat_id ), get_catname( $default_link_cat_id ) )) . "' );\" class='delete'>".__( 'Delete' ).""; @@ -833,7 +833,7 @@ function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) { $post->post_title = wp_specialchars( $post->post_title ); $pad = str_repeat( '— ', $level ); - $id = $post->ID; + $id = (int) $post->ID; $class = ('alternate' == $class ) ? '' : 'alternate'; ?> @@ -1969,7 +1969,7 @@ function wp_import_handle_upload() { ); // Save the data - $id = wp_insert_attachment( $object, $file ); + $id = (int) wp_insert_attachment( $object, $file ); return array( 'file' => $file, 'id' => $id ); } diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 5daad1e04e..fc3a276187 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -1,323 +1,323 @@ -admin_header_callback = $admin_header_callback; - } - - function init() { - $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page')); - - add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); - add_action("admin_head-$page", array(&$this, 'js'), 50); - add_action("admin_head-$page", $this->admin_header_callback, 51); - } - - function js_includes() { - wp_enqueue_script('cropper'); - wp_enqueue_script('colorpicker'); - } - - function js() { - - if ( isset( $_POST['textcolor'] ) ) { - if ( 'blank' == $_POST['textcolor'] ) { - set_theme_mod('header_textcolor', 'blank'); - } else { - $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']); - if ( strlen($color) == 6 || strlen($color) == 3 ) - set_theme_mod('header_textcolor', $color); - } - } - if ( isset($_POST['resetheader']) ) - remove_theme_mods(); - ?> - - -
-

-
- - -
-

-

- -
-

-
-
- -
- - -
- - - -
-
-

-

%1$d x %2$d pixels will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?>

- -
-
- -

- -

-
- -
- - -
-

-

-
- -
-
- false); - $file = wp_handle_upload($_FILES['import'], $overrides); - - if ( isset($file['error']) ) - die( $file['error'] ); - - $url = $file['url']; - $file = $file['file']; - $filename = basename($file); - - // Construct the object array - $object = array( - 'post_title' => $filename, - 'post_content' => $url, - 'post_mime_type' => 'import', - 'guid' => $url); - - // Save the data - $id = wp_insert_attachment($object, $file); - - $upload = array('file' => $file, 'id' => $id); - - list($width, $height, $type, $attr) = getimagesize( $file ); - - if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) { - set_theme_mod('header_image', $url); - $header = apply_filters('wp_create_file_in_uploads', $file, $id); // For replication - return $this->finished(); - } elseif ( $width > HEADER_IMAGE_WIDTH ) { - $oitar = $width / HEADER_IMAGE_WIDTH; - $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); - $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication - - $url = str_replace(basename($url), basename($image), $url); - $width = $width / $oitar; - $height = $height / $oitar; - } else { - $oitar = 1; - } - ?> - -
- -
- -

-
- -
- -

- - - - - - - - - -

- -
-
- 1 ) { - $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; - $_POST['y1'] = $_POST['y1'] * $_POST['oitar']; - $_POST['width'] = $_POST['width'] * $_POST['oitar']; - $_POST['height'] = $_POST['height'] * $_POST['oitar']; - } - - $header = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); - $header = apply_filters('wp_create_file_in_uploads', $header); // For replication - - $parent = get_post($_POST['attachment_id']); - - $parent_url = $parent->guid; - - $url = str_replace(basename($parent_url), basename($header), $parent_url); - - set_theme_mod('header_image', $url); - - // cleanup - $file = get_attached_file( $_POST['attachment_id'] ); - $medium = str_replace(basename($file), 'midsize-'.basename($file), $file); - @unlink( apply_filters( 'wp_delete_file', $medium ) ); - wp_delete_attachment( $_POST['attachment_id'] ); - - return $this->finished(); - } - - function finished() { - ?> -
-

- -

- -
- step_1(); - } elseif ( 2 == $step ) { - $this->step_2(); - } elseif ( 3 == $step ) { - $this->step_3(); - } - - } - -} -?> +admin_header_callback = $admin_header_callback; + } + + function init() { + $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page')); + + add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); + add_action("admin_head-$page", array(&$this, 'js'), 50); + add_action("admin_head-$page", $this->admin_header_callback, 51); + } + + function js_includes() { + wp_enqueue_script('cropper'); + wp_enqueue_script('colorpicker'); + } + + function js() { + + if ( isset( $_POST['textcolor'] ) ) { + if ( 'blank' == $_POST['textcolor'] ) { + set_theme_mod('header_textcolor', 'blank'); + } else { + $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['textcolor']); + if ( strlen($color) == 6 || strlen($color) == 3 ) + set_theme_mod('header_textcolor', $color); + } + } + if ( isset($_POST['resetheader']) ) + remove_theme_mods(); + ?> + + +
+

+
+ + +
+

+

+ +
+

+
+
+ +
+ + +
+ + + +
+
+

+

%1$d x %2$d pixels will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?>

+ +
+
+ +

+ +

+
+ +
+ + +
+

+

+
+ +
+
+ false); + $file = wp_handle_upload($_FILES['import'], $overrides); + + if ( isset($file['error']) ) + die( $file['error'] ); + + $url = $file['url']; + $file = $file['file']; + $filename = basename($file); + + // Construct the object array + $object = array( + 'post_title' => $filename, + 'post_content' => $url, + 'post_mime_type' => 'import', + 'guid' => $url); + + // Save the data + $id = (int) wp_insert_attachment($object, $file); + + $upload = array('file' => $file, 'id' => $id); + + list($width, $height, $type, $attr) = getimagesize( $file ); + + if ( $width == HEADER_IMAGE_WIDTH && $height == HEADER_IMAGE_HEIGHT ) { + set_theme_mod('header_image', $url); + $header = apply_filters('wp_create_file_in_uploads', $file, $id); // For replication + return $this->finished(); + } elseif ( $width > HEADER_IMAGE_WIDTH ) { + $oitar = $width / HEADER_IMAGE_WIDTH; + $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); + $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication + + $url = str_replace(basename($url), basename($image), $url); + $width = $width / $oitar; + $height = $height / $oitar; + } else { + $oitar = 1; + } + ?> + +
+ +
+ +

+
+ +
+ +

+ + + + + + + + + +

+ +
+
+ 1 ) { + $_POST['x1'] = $_POST['x1'] * $_POST['oitar']; + $_POST['y1'] = $_POST['y1'] * $_POST['oitar']; + $_POST['width'] = $_POST['width'] * $_POST['oitar']; + $_POST['height'] = $_POST['height'] * $_POST['oitar']; + } + + $header = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); + $header = apply_filters('wp_create_file_in_uploads', $header); // For replication + + $parent = get_post($_POST['attachment_id']); + + $parent_url = $parent->guid; + + $url = str_replace(basename($parent_url), basename($header), $parent_url); + + set_theme_mod('header_image', $url); + + // cleanup + $file = get_attached_file( $_POST['attachment_id'] ); + $medium = str_replace(basename($file), 'midsize-'.basename($file), $file); + @unlink( apply_filters( 'wp_delete_file', $medium ) ); + wp_delete_attachment( $_POST['attachment_id'] ); + + return $this->finished(); + } + + function finished() { + ?> +
+

+ +

+ +
+ step_1(); + } elseif ( 2 == $step ) { + $this->step_2(); + } elseif ( 3 == $step ) { + $this->step_3(); + } + + } + +} +?> diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 9307b9034e..0557270997 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -56,7 +56,7 @@ if ( !empty( $_POST['delete_comments'] ) ) : $i = 0; 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) ) { if ( !empty( $_POST['spam_button'] ) ) diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 0e60e6d642..50ded417c7 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -546,7 +546,7 @@ class Blogger_Import { } } - $comment_post_ID = $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink]; + $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink]; preg_match('#(.+?).*(?:\(.+?))?#', $entry->author, $matches); $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) ); $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) ); diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 62b77dcae5..27b4785d84 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -104,7 +104,7 @@ class BW_Import { $comments = $comments[1]; if ( $comments ) { - $comment_post_ID = $post_id; + $comment_post_ID = (int) $post_id; $num_comments = 0; foreach ($comments as $comment) { preg_match('|(.*?)|is', $comment, $comment_content); diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 0eb092b25a..9a32e3a891 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -437,8 +437,8 @@ class Dotclear_Import { extract($comment); // 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)); $email = $wpdb->escape($comment_email); diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index e1389cdf7f..690005b309 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -82,7 +82,7 @@ class LJ_Import { $comments = $comments[1]; if ( $comments ) { - $comment_post_ID = $post_id; + $comment_post_ID = (int) $post_id; $num_comments = 0; foreach ($comments as $comment) { preg_match('|(.*?)|is', $comment, $comment_content); diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 881039c646..53af688c6c 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -171,7 +171,7 @@ class MT_Import { return; } $this->file = $file['file']; - $this->id = $file['id']; + $this->id = (int) $file['id']; $this->get_entries(); $this->mt_authors_form(); @@ -295,7 +295,7 @@ class MT_Import { } } - $comment_post_ID = $post_id; + $comment_post_ID = (int) $post_id; $comment_approved = 1; // Now for comments diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 8cc17b8ee0..c5a4801a16 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -174,7 +174,7 @@ class WP_Import { return; } $this->file = $file['file']; - $this->id = $file['id']; + $this->id = (int) $file['id']; $this->get_entries(); $this->wp_authors_form(); diff --git a/wp-comments-post.php b/wp-comments-post.php index 5988fd5f8b..bad56563d6 100644 --- a/wp-comments-post.php +++ b/wp-comments-post.php @@ -54,7 +54,7 @@ if ( '' == $comment_content ) $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'user_ID'); -$comment_id = wp_new_comment( $commentdata ); +$comment_id = (int) wp_new_comment( $commentdata ); $comment = get_comment($comment_id); if ( !$user->ID ) : diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index e323d059a9..9502814952 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -144,7 +144,7 @@ function the_author_posts_link($deprecated = '') { 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(); if ( empty($link) ) { diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php index 4249f7fc94..45846f44cd 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -165,7 +165,8 @@ function get_linkcatname($id = 0) { if ( empty($cats) || ! is_array($cats) ) return ''; - $cat_id = $cats[0]; // Take the first cat. + $cat_id = (int) + $cats[0]; // Take the first cat. $cat = get_category($cat_id); return $cat->cat_name; diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 236327ed0e..c1aabf543c 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -64,7 +64,8 @@ global $post, $category_cache, $blog_id; $id = (int) $id; if ( !$id ) - $id = $post->ID; + $id = (int) + $post->ID; if ( !isset($category_cache[$blog_id][$id]) ) update_post_category_cache($id); diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 6ab6bc3d26..19fed0c9a6 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -150,7 +150,7 @@ function get_comments_number( $post_id = 0 ) { $post_id = (int) $post_id; if ( !$post_id ) - $post_id = $id; + $post_id = (int) $id; $post = get_post($post_id); if ( ! isset($post->comment_count) ) diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 2d0243bcc8..94e32696e5 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -345,7 +345,7 @@ function wp_insert_comment($commentdata) { ('$comment_post_ID', '$comment_author', '$comment_author_email', '$comment_author_url', '$comment_author_IP', '$comment_date', '$comment_date_gmt', '$comment_content', '$comment_approved', '$comment_agent', '$comment_type', '$comment_parent', '$user_id') "); - $id = $wpdb->insert_id; + $id = (int) $wpdb->insert_id; if ( $comment_approved == 1) wp_update_comment_count($comment_post_ID); @@ -392,7 +392,7 @@ function wp_new_comment( $commentdata ) { $commentdata['comment_approved'] = wp_allow_comment($commentdata); - $comment_ID = wp_insert_comment($commentdata); + $comment_ID = (int) wp_insert_comment($commentdata); do_action('comment_post', $comment_ID, $commentdata['comment_approved']); diff --git a/wp-includes/feed.php b/wp-includes/feed.php index da4e8fb759..c0c8cb17c0 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -106,7 +106,7 @@ function comments_rss($commentsrssfilename = 'nolongerused') { 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'); if ( '' == $permalink_structure ) { diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 32e9096ad4..6917958ff2 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -646,7 +646,7 @@ function update_post_category_cache($post_ids) { $post_id_array = (array) explode(',', $post_ids); $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 ] ); continue; @@ -700,7 +700,7 @@ function update_postmeta_cache($post_id_list = '') { $post_id_array = (array) explode(',', $post_id_list); $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 ] ); continue; diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 873bca5179..a7f9601d3e 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -119,7 +119,7 @@ function get_page_link($id = false) { $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') ) $link = get_option('home'); @@ -134,7 +134,7 @@ function _get_page_link( $id = false ) { global $post, $wp_rewrite; if ( !$id ) - $id = $post->ID; + $id = (int) $post->ID; $pagestruct = $wp_rewrite->get_page_permastruct(); @@ -156,7 +156,7 @@ function get_attachment_link($id = false) { $link = false; if (! $id) { - $id = $post->ID; + $id = (int) $post->ID; } $object = get_post($id); @@ -259,7 +259,7 @@ function get_post_comments_feed_link($post_id = '', $feed = 'rss2') { global $id; if ( empty($post_id) ) - $post_id = $id; + $post_id = (int) $id; if ( '' != get_option('permalink_structure') ) { $url = trailingslashit( get_permalink() ) . 'feed'; diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 0b796c2c45..a560df001e 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -525,7 +525,7 @@ endif; if ( !function_exists('wp_verify_nonce') ) : function wp_verify_nonce($nonce, $action = -1) { $user = wp_get_current_user(); - $uid = $user->id; + $uid = (int) $user->id; $i = ceil(time() / 43200); @@ -539,7 +539,7 @@ endif; if ( !function_exists('wp_create_nonce') ) : function wp_create_nonce($action = -1) { $user = wp_get_current_user(); - $uid = $user->id; + $uid = (int) $user->id; $i = ceil(time() / 43200); diff --git a/wp-includes/post.php b/wp-includes/post.php index a3c50f4289..20ab78bccf 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -375,7 +375,7 @@ function get_post_custom($post_id = 0) { global $id, $post_meta_cache, $wpdb, $blog_id; if ( !$post_id ) - $post_id = $id; + $post_id = (int) $id; $post_id = (int) $post_id; @@ -539,7 +539,7 @@ function wp_insert_post($postarr = array()) { // 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 // post name. @@ -1256,7 +1256,7 @@ function wp_insert_attachment($object, $file = false, $post_parent = 0) { $update = false; if ( !empty($ID) ) { $update = true; - $post_ID = $ID; + $post_ID = (int) $ID; } // Create a valid post name. @@ -1506,7 +1506,7 @@ function wp_mime_type_icon( $mime = 0 ) { $mime = (int) $mime; if ( !$post =& get_post( $mime ) ) return false; - $post_id = $post->ID; + $post_id = (int) $post->ID; $mime = $post->post_mime_type; } diff --git a/wp-includes/query.php b/wp-includes/query.php index 5d9af7891e..f4c948f275 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -587,7 +587,7 @@ class WP_Query { if ( '' != $qv['pagename'] ) { $this->queried_object =& get_page_by_path($qv['pagename']); if ( !empty($this->queried_object) ) - $this->queried_object_id = $this->queried_object->ID; + $this->queried_object_id = (int) $this->queried_object->ID; else unset($this->queried_object); @@ -1205,18 +1205,18 @@ class WP_Query { $cat = $this->get('cat'); $category = &get_category($cat); $this->queried_object = &$category; - $this->queried_object_id = $cat; + $this->queried_object_id = (int) $cat; } else if ($this->is_posts_page) { $this->queried_object = & get_page(get_option('page_for_posts')); - $this->queried_object_id = $this->queried_object->ID; + $this->queried_object_id = (int) $this->queried_object->ID; } else if ($this->is_single) { $this->queried_object = $this->post; - $this->queried_object_id = $this->post->ID; + $this->queried_object_id = (int) $this->post->ID; } else if ($this->is_page) { $this->queried_object = $this->post; - $this->queried_object_id = $this->post->ID; + $this->queried_object_id = (int) $this->post->ID; } else if ($this->is_author) { - $author_id = $this->get('author'); + $author_id = (int) $this->get('author'); $author = get_userdata($author_id); $this->queried_object = $author; $this->queried_object_id = $author_id; @@ -1285,7 +1285,7 @@ function setup_postdata($post) { global $id, $postdata, $authordata, $day, $page, $pages, $multipage, $more, $numpages, $wp_query; global $pagenow; - $id = $post->ID; + $id = (int) $post->ID; $authordata = get_userdata($post->post_author); diff --git a/wp-includes/registration.php b/wp-includes/registration.php index adcb6597c3..31c6d27e63 100644 --- a/wp-includes/registration.php +++ b/wp-includes/registration.php @@ -89,7 +89,7 @@ function wp_insert_user($userdata) { $query = "UPDATE $wpdb->users SET user_pass='$user_pass', user_email='$user_email', user_url='$user_url', user_nicename = '$user_nicename', display_name = '$display_name' WHERE ID = '$ID'"; $query = apply_filters('update_user_query', $query); $wpdb->query( $query ); - $user_id = $ID; + $user_id = (int) $ID; } else { $query = "INSERT INTO $wpdb->users (user_login, user_pass, user_email, user_url, user_registered, user_nicename, display_name) @@ -97,7 +97,7 @@ function wp_insert_user($userdata) { ('$user_login', '$user_pass', '$user_email', '$user_url', '$user_registered', '$user_nicename', '$display_name')"; $query = apply_filters('create_user_query', $query); $wpdb->query( $query ); - $user_id = $wpdb->insert_id; + $user_id = (int) $wpdb->insert_id; } update_usermeta( $user_id, 'first_name', $first_name); diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 7e45c5487e..2a7ac8ce0c 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -346,7 +346,7 @@ function get_home_template() { function get_page_template() { global $wp_query; - $id = $wp_query->post->ID; + $id = (int) $wp_query->post->ID; $template = get_post_meta($id, '_wp_page_template', true); if ( 'default' == $template ) diff --git a/wp-includes/user.php b/wp-includes/user.php index 4618d523c8..8b8151498e 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -56,7 +56,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false function get_users_of_blog( $id = '' ) { global $wpdb, $blog_id; if ( empty($id) ) - $id = $blog_id; + $id = (int) $blog_id; $users = $wpdb->get_results( "SELECT user_id, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE " . $wpdb->users . ".ID = " . $wpdb->usermeta . ".user_id AND meta_key = '" . $wpdb->prefix . "capabilities' ORDER BY {$wpdb->usermeta}.user_id" ); return $users; } @@ -171,8 +171,8 @@ function setup_userdata($user_id = '') { $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; $user_pass_md5 = md5($user->user_pass); diff --git a/wp-login.php b/wp-login.php index e69d559a58..198865fb2e 100644 --- a/wp-login.php +++ b/wp-login.php @@ -242,7 +242,7 @@ case 'register' : if ( empty( $errors ) ) { $user_pass = substr( md5( uniqid( microtime() ) ), 0, 7); - $user_id = wp_create_user( $user_login, $user_pass, $user_email ); + $user_id = (int) wp_create_user( $user_login, $user_pass, $user_email ); if ( !$user_id ) $errors['registerfail'] = sprintf(__('ERROR: Couldn’t register you... please contact the webmaster !'), get_option('admin_email')); else { diff --git a/wp-mail.php b/wp-mail.php index fe503d352d..f6cc470b60 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -136,7 +136,7 @@ for ($i=1; $i <= $count; $i++) : $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); $post_data = add_magic_quotes($post_data); - $post_ID = wp_insert_post($post_data); + $post_ID = (int) wp_insert_post($post_data); if (!$post_ID) { // we couldn't post, for whatever reason. better move forward to the next email diff --git a/wp-trackback.php b/wp-trackback.php index bce5933aad..c128476dd4 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -84,7 +84,7 @@ if ( !empty($tb_url) && !empty($title) ) { $title = (strlen($title) > 250) ? substr($title, 0, 250) . '...' : $title; } - $comment_post_ID = $tb_id; + $comment_post_ID = (int) $tb_id; $comment_author = $blog_name; $comment_author_email = ''; $comment_author_url = $tb_url; diff --git a/xmlrpc.php b/xmlrpc.php index f88b2aa084..423fed2768 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -172,8 +172,8 @@ class wp_xmlrpc_server extends IXR_Server { function wp_getPage($args) { $this->escape($args); - $blog_id = $args[0]; - $page_id = $args[1]; + $blog_id = (int) $args[0]; + $page_id = (int) $args[1]; $username = $args[2]; $password = $args[3]; @@ -252,7 +252,7 @@ class wp_xmlrpc_server extends IXR_Server { function wp_getPages($args) { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; @@ -320,10 +320,10 @@ class wp_xmlrpc_server extends IXR_Server { function wp_deletePage($args) { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; - $page_id = $args[3]; + $page_id = (int) $args[3]; if(!$this->login_pass_ok($username, $password)) { return($this->error); @@ -360,7 +360,7 @@ class wp_xmlrpc_server extends IXR_Server { */ function wp_editPage($args) { // Items not escaped here will be escaped in editPost. - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $page_id = $this->escape((int) $args[1]); $username = $this->escape($args[2]); $password = $this->escape($args[3]); @@ -411,7 +411,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; @@ -451,7 +451,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; @@ -469,7 +469,7 @@ class wp_xmlrpc_server extends IXR_Server { function wp_newCategory($args) { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; $category = $args[3]; @@ -512,7 +512,7 @@ class wp_xmlrpc_server extends IXR_Server { "category_description" => $category["description"] ); - $cat_id = wp_insert_category($new_category); + $cat_id = (int) wp_insert_category($new_category); if(!$cat_id) { return(new IXR_Error(500, "Sorry, the new category failed.")); } @@ -529,7 +529,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_id = $args[0]; + $blog_id = (int) $args[0]; $username = $args[1]; $password = $args[2]; $category = $args[3]; @@ -620,7 +620,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[1]; + $post_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; @@ -655,7 +655,7 @@ class wp_xmlrpc_server extends IXR_Server { $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]; $num_posts = $args[4]; @@ -703,7 +703,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; + $blog_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $template = $args[4]; /* could be 'main' or 'archiveIndex', but we don't use it */ @@ -737,7 +737,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[1]; + $blog_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $content = $args[4]; @@ -774,7 +774,7 @@ class wp_xmlrpc_server extends IXR_Server { $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]; $content = $args[4]; @@ -802,7 +802,7 @@ class wp_xmlrpc_server extends IXR_Server { $post_data = compact('blog_ID', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status'); - $post_ID = wp_insert_post($post_data); + $post_ID = (int) wp_insert_post($post_data); if (!$post_ID) { return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.'); @@ -873,7 +873,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[1]; + $post_ID = (int) $args[1]; $user_login = $args[2]; $user_pass = $args[3]; $publish = $args[4]; @@ -914,7 +914,7 @@ class wp_xmlrpc_server extends IXR_Server { $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]; $content_struct = $args[3]; @@ -1030,7 +1030,7 @@ class wp_xmlrpc_server extends IXR_Server { // We've got all the data -- post it: $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order'); - $post_ID = wp_insert_post($postdata); + $post_ID = (int) wp_insert_post($postdata); if (!$post_ID) { return new IXR_Error(500, 'Sorry, your entry could not be posted. Something wrong happened.'); @@ -1216,7 +1216,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1278,10 +1278,10 @@ class wp_xmlrpc_server extends IXR_Server { $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)) { return $this->error; @@ -1351,7 +1351,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; + $blog_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1386,7 +1386,7 @@ class wp_xmlrpc_server extends IXR_Server { 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]); $data = $args[3]; @@ -1447,7 +1447,7 @@ class wp_xmlrpc_server extends IXR_Server { ); // Save the data - $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id ); + $id = (int) wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id ); wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) ); return apply_filters( 'wp_handle_upload', array( 'file' => $name, 'url' => $upload[ 'url' ], 'type' => $type ) ); @@ -1463,10 +1463,10 @@ class wp_xmlrpc_server extends IXR_Server { $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)) { return $this->error; @@ -1508,7 +1508,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $blog_ID = $args[0]; + $blog_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1537,7 +1537,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1567,7 +1567,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; $categories = $args[3]; @@ -1650,7 +1650,7 @@ class wp_xmlrpc_server extends IXR_Server { $this->escape($args); - $post_ID = $args[0]; + $post_ID = (int) $args[0]; $user_login = $args[1]; $user_pass = $args[2]; @@ -1712,18 +1712,18 @@ class wp_xmlrpc_server extends IXR_Server { } elseif (preg_match('#p/[0-9]{1,}#', $urltest['path'], $match)) { // 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'])) { // an #anchor is there, it's either... 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'])) { // ...a post id in the form 'post-###' @@ -1837,7 +1837,7 @@ class wp_xmlrpc_server extends IXR_Server { $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_content', 'comment_type'); - $comment_ID = wp_new_comment($commentdata); + $comment_ID = (int) wp_new_comment($commentdata); do_action('pingback_post', $comment_ID); return "Pingback from $pagelinkedfrom to $pagelinkedto registered. Keep the web talking! :-)"; @@ -1855,7 +1855,7 @@ class wp_xmlrpc_server extends IXR_Server { $url = $args; - $post_ID = url_to_postid($url); + $post_ID = (int) url_to_postid($url); if (!$post_ID) { // We aren't sure that the resource is available and/or pingback enabled return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');