|
@@ -659,7 +659,6 @@
// convert it to table rows
$out = '';
- $class = '';
$count = 0;
foreach( $tags as $tag )
$out .= _tag_row( $tag, ++$count % 2 ? ' class="iedit alternate"' : ' class="iedit"' );
@@ -1878,7 +1877,6 @@
global $comment, $post;
$comment = get_comment( $comment_id );
$post = get_post($comment->comment_post_ID);
- $authordata = get_userdata($post->post_author);
$the_comment_status = wp_get_comment_status($comment->comment_ID);
if ( current_user_can( 'edit_post', $post->ID ) ) {
Index: wp-admin/page.php
===================================================================
--- wp-admin/page.php (revision 9707)
+++ wp-admin/page.php (working copy)
@@ -22,6 +22,8 @@
* @param int $page_ID Page ID.
*/
function redirect_page($page_ID) {
+ global $action;
+
$referredby = '';
if ( !empty($_POST['referredby']) ) {
$referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
Index: wp-includes/bookmark.php
===================================================================
--- wp-includes/bookmark.php (revision 9707)
+++ wp-includes/bookmark.php (working copy)
@@ -29,7 +29,7 @@
wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
$_bookmark = $bookmark;
} else {
- if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $link) ) {
+ if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
$_bookmark = & $GLOBALS['link'];
} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
$_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
Index: wp-includes/cron.php
===================================================================
--- wp-includes/cron.php (revision 9707)
+++ wp-includes/cron.php (working copy)
@@ -158,7 +158,6 @@
* @return null Cron could not be spawned, because it is not needed to run.
*/
function spawn_cron( $local_time ) {
- global $current_blog;
/*
* do not even start the cron if local server timer has drifted
Index: wp-includes/http.php
===================================================================
--- wp-includes/http.php (revision 9707)
+++ wp-includes/http.php (working copy)
@@ -411,7 +411,7 @@
$length = hexdec( $match[1] );
$chunkLength = strlen( $match[0] );
- $strBody = substr($body, strlen( $match[0] ), $length);
+ $strBody = substr($body, $chunkLength, $length);
$parsedBody .= $strBody;
$body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php (revision 9707)
+++ wp-includes/pluggable.php (working copy)
@@ -1512,9 +1512,7 @@
$default = $avatar_default;
}
- if ( 'custom' == $default )
- $default = add_query_arg( 's', $size, $defaults[$avatar_default][1] );
- elseif ( 'mystery' == $default )
+ if ( 'mystery' == $default )
$default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
elseif ( 'blank' == $default )
$default = includes_url('images/blank.gif');
@@ -1524,6 +1522,8 @@
$default = "http://www.gravatar.com/avatar/s={$size}";
elseif ( empty($email) )
$default = "http://www.gravatar.com/avatar/?d=$default&s={$size}";
+ else
+ $default = add_query_arg( 's', $size, $default );
if ( !empty($email) ) {
$out = 'http://www.gravatar.com/avatar/';
Index: wp-includes/plugin.php
===================================================================
--- wp-includes/plugin.php (revision 9707)
+++ wp-includes/plugin.php (working copy)
@@ -123,7 +123,7 @@
* @subpackage Plugin
* @since 0.71
* @global array $wp_filter Stores all of the filters
- * @global array $merge_filters Merges the filter hooks using this function.
+ * @global array $merged_filters Merges the filter hooks using this function.
* @global array $wp_current_filter stores the list of current filters with the current one last
*
* @param string $tag The name of the filter hook.
@@ -219,7 +219,7 @@
* @return bool True when finished.
*/
function remove_all_filters($tag, $priority = false) {
- global $wp_filter, $merge_filters;
+ global $wp_filter, $merged_filters;
if( isset($wp_filter[$tag]) ) {
if( false !== $priority && isset($$wp_filter[$tag][$priority]) )
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php (revision 9707)
+++ wp-includes/post.php (working copy)
@@ -2160,7 +2160,7 @@
$pages = $wpdb->get_results($query);
if ( empty($pages) ) {
- $page = apply_filters('get_pages', array(), $r);
+ $pages = apply_filters('get_pages', array(), $r);
return $pages;
}
@@ -3321,7 +3321,7 @@
* @return object|bool The autosaved data or false on failure or when no autosave exists.
*/
function wp_get_post_autosave( $post_id ) {
- global $wpdb;
+
if ( !$post = get_post( $post_id ) )
return false;
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php (revision 9707)
+++ wp-includes/theme.php (working copy)
@@ -186,7 +186,7 @@
if ( preg_match( '|Author URI:(.*)$|mi', $theme_data, $author_uri ) )
$author_uri = clean_url( trim( $author_uri[1]) );
else
- $author_uti = '';
+ $author_uri = '';
if ( preg_match( '|Template:(.*)$|mi', $theme_data, $template ) )
$template = wp_kses( trim( $template[1] ), $themes_allowed_tags );
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php (revision 9707)
+++ wp-includes/user.php (working copy)
@@ -259,7 +259,7 @@
$meta_value = trim( $meta_value );
if ( ! empty($meta_value) )
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $userid, $meta_key, $meta_value) );
+ $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
else
$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
|