Merge remote-tracking branch 'upstream/master'

staylor · Jun 12, 2015 · e8b4269 · e8b4269
2 parents c4267b4 + 3f4cadf
commit e8b4269
Show file tree

Hide file tree

Showing 7 changed files with 313 additions and 253 deletions.
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
@@ -434,7 +434,7 @@ public function ajax_background_add() {
 	 * @deprecated 3.5.0
 	 *
 	 * @param array $form_fields
-	 * @return $form_fields
+	 * @return array $form_fields
 	 */
 	public function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
@@ -445,8 +445,8 @@ public function attachment_fields_to_edit( $form_fields ) {
 	 * @since 3.4.0
 	 * @deprecated 3.5.0
 	 *
-	 * @param $tabs
-	 * @return $tabs
+	 * @param array $tabs
+	 * @return array $tabs
 	 */
 	public function filter_upload_tabs( $tabs ) {
 		return $tabs;

diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
@@ -926,7 +926,7 @@ public function admin_page() {
 	 * @since 3.4.0
 	 *
 	 * @param array $form_fields
-	 * @return $form_fields
+	 * @return array $form_fields
 	 */
 	public function attachment_fields_to_edit( $form_fields ) {
 		return $form_fields;
@@ -938,7 +938,7 @@ public function attachment_fields_to_edit( $form_fields ) {
 	 * @since 3.4.0
 	 *
 	 * @param array $tabs
-	 * @return $tabs
+	 * @return array $tabs
 	 */
 	public function filter_upload_tabs( $tabs ) {
 		return $tabs;

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
@@ -574,17 +574,10 @@ public function column_cb( $comment ) {
 	}
 
 	/**
-	 *
-	 * @global string $comment_status
-	 *
 	 * @param object $comment
 	 */
 	public function column_comment( $comment ) {
-		global $comment_status;
-		$post = get_post();
-
 		$comment_url = esc_url( get_comment_link( $comment->comment_ID ) );
-		$the_comment_status = wp_get_comment_status( $comment->comment_ID );
 
 		echo '<div class="comment-author">';
 			$this->column_author( $comment );

diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php
@@ -481,7 +481,8 @@ public function display_rows() {
 					$taxonomy = false;
 
 				if ( $taxonomy ) {
-					if ( $terms = get_the_terms( $post->ID, $taxonomy ) ) {
+					$terms = get_the_terms( $post->ID, $taxonomy );
+					if ( is_array( $terms ) ) {
 						$out = array();
 						foreach ( $terms as $t ) {
 							$posts_in_term_qv = array();