From 838592c1ba8c2bd43e4973c75bfa8bf65f997576 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Wed, 18 Nov 2015 19:05:30 +0000 Subject: [PATCH] List Tables: because we can never eradicate the existence of globals, ensure that `$comment` is hoisted into the global space inside `WP_Comments_List_Table::single_row()`. Fixes #34654. Built from https://develop.svn.wordpress.org/trunk@35674 git-svn-id: http://core.svn.wordpress.org/trunk@35638 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-comments-list-table.php | 13 ++++++++----- wp-includes/version.php | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index 6560ff2c52..aafc37a0b3 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -474,12 +474,15 @@ class WP_Comments_List_Table extends WP_List_Table { } /** - * @global WP_Post $post + * @global WP_Post $post + * @global WP_Comment $comment * - * @param object $comment + * @param WP_Comment $item */ - public function single_row( $comment ) { - global $post; + public function single_row( $item ) { + global $post, $comment; + + $comment = $item; $the_comment_class = wp_get_comment_status( $comment ); if ( ! $the_comment_class ) { @@ -496,7 +499,7 @@ class WP_Comments_List_Table extends WP_List_Table { $this->single_row_columns( $comment ); echo "\n"; - $post = null; + unset( $post, $comment ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 38ee777b00..0c13b2453c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta4-35673'; +$wp_version = '4.4-beta4-35674'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.