From 2e96b99ceb195735a641e299f3209840cc101052 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 23 Mar 2007 17:46:02 +0000 Subject: Ryan casts an int and catches a fish, someone buy him a pint! merge to 5092 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@933 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/author-template.php | 2 +- wp-includes/bookmark-template.php | 2 +- wp-includes/category-template.php | 3 ++- wp-includes/comment-template.php | 2 +- wp-includes/comment.php | 2 +- wp-includes/feed.php | 2 +- wp-includes/formatting.php | 5 +++++ wp-includes/functions.php | 4 ++-- wp-includes/link-template.php | 8 ++++---- wp-includes/pluggable.php | 4 ++-- wp-includes/post.php | 25 ++++++++++++++++--------- wp-includes/query.php | 14 +++++++------- wp-includes/registration.php | 4 ++-- wp-includes/theme.php | 2 +- wp-includes/user.php | 4 ++-- 15 files changed, 48 insertions(+), 35 deletions(-) (limited to 'wp-includes') diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index 28fa28d..aa4013d 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 4249f7f..e7a8480 100644 --- a/wp-includes/bookmark-template.php +++ b/wp-includes/bookmark-template.php @@ -165,7 +165,7 @@ 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 32ace67..db45dc0 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -65,8 +65,9 @@ function get_category_parents($id, $link = FALSE, $separator = '/', $nicename = function get_the_category($id = false) { 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 6ab6bc3..19fed0c 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 7ed9d9c..6da2264 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); diff --git a/wp-includes/feed.php b/wp-includes/feed.php index 741bf7b..26eb4da 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/formatting.php b/wp-includes/formatting.php index a36de22..a0c13db 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1072,6 +1072,11 @@ function clean_url( $url, $protocols = null ) { $strip = array('%0d', '%0a'); $url = str_replace($strip, '', $url); $url = str_replace(';//', '://', $url); + // Append http unless a relative link starting with / or a php file. + if ( strpos($url, '://') === false && + substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9]+.php/i', $url) ) + $url = 'http://' . $url; + $url = (strpos($url, '://') === false && substr( $url, 0, 1 ) != '/' ) ? 'http://'.$url : $url; $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url); if ( !is_array($protocols) ) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e93bf7a..ba67d5f 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -663,7 +663,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; @@ -717,7 +717,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 873bca5..a7f9601 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 b15b3fa..5f00e1d 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -532,7 +532,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); @@ -546,7 +546,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 ab7c49c..0c0dfb6 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; @@ -449,6 +449,8 @@ function wp_delete_post($postid = 0) { } function wp_get_post_categories($post_id = 0) { + $post_id = (int) $post_id; + $cats = &get_the_category($post_id); $cat_ids = array(); foreach ( $cats as $cat ) @@ -460,6 +462,7 @@ function wp_get_recent_posts($num = 10) { global $wpdb; // Set the limit clause, if we got a limit + $num = (int) $num; if ($num) { $limit = "LIMIT $num"; } @@ -473,6 +476,8 @@ function wp_get_recent_posts($num = 10) { function wp_get_single_post($postid = 0, $mode = OBJECT) { global $wpdb; + $postid = (int) $postid; + $post = get_post($postid, $mode); // Set categories @@ -536,7 +541,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. @@ -640,7 +645,7 @@ function wp_insert_post($postarr = array()) { (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_modified, post_modified_gmt, post_parent, menu_order, post_mime_type) 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; } if ( empty($post_name) && 'draft' != $post_status ) { @@ -768,6 +773,8 @@ function wp_publish_post($post_id) { function wp_set_post_categories($post_ID = 0, $post_categories = array()) { global $wpdb; + + $post_ID = (int) $post_ID; // If $post_categories isn't already an array, make it one: if (!is_array($post_categories) || 0 == count($post_categories) || empty($post_categories)) $post_categories = array(get_option('default_category')); @@ -778,7 +785,7 @@ function wp_set_post_categories($post_ID = 0, $post_categories = array()) { $old_categories = $wpdb->get_col(" SELECT category_id FROM $wpdb->post2cat - WHERE post_id = $post_ID"); + WHERE post_id = '$post_ID'"); if (!$old_categories) { $old_categories = array(); @@ -793,8 +800,8 @@ function wp_set_post_categories($post_ID = 0, $post_categories = array()) { foreach ($delete_cats as $del) { $wpdb->query(" DELETE FROM $wpdb->post2cat - WHERE category_id = $del - AND post_id = $post_ID + WHERE category_id = '$del' + AND post_id = '$post_ID' "); } } @@ -1251,7 +1258,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. @@ -1346,7 +1353,7 @@ function wp_insert_attachment($object, $file = false, $post_parent = 0) { (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_modified, post_modified_gmt, post_parent, menu_order, post_mime_type, guid) 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; } if ( empty($post_name) ) { @@ -1501,7 +1508,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 3432f74..26e1afc 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 1e7a38c..6c03206 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 7e45c54..2a7ac8c 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 281483f..058fb1c 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -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); -- cgit