From f0b95b7bccfb0e0a735f162598883fd95ef11c7c Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 10 Sep 2015 21:29:24 +0000 Subject: [PATCH] Move `comment_footer_die()` from `wp-admin/comment.php` to `wp-admin/includes/comment.php`. See #33813. Built from https://develop.svn.wordpress.org/trunk@34019 git-svn-id: http://core.svn.wordpress.org/trunk@33988 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/comment.php | 11 ----------- wp-admin/includes/comment.php | 11 +++++++++++ wp-includes/version.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wp-admin/comment.php b/wp-admin/comment.php index d83cb53544..ab0235218c 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -33,17 +33,6 @@ if ( isset( $_GET['dt'] ) ) { $action = 'trash'; } -/** - * Display error message at bottom of comments. - * - * @param string $msg Error Message. Assumed to contain HTML and be sanitized. - */ -function comment_footer_die( $msg ) { - echo "

$msg

"; - include( ABSPATH . 'wp-admin/admin-footer.php' ); - die; -} - switch( $action ) { case 'editcomment' : diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php index c9087ec962..dfb39220ab 100644 --- a/wp-admin/includes/comment.php +++ b/wp-admin/includes/comment.php @@ -171,3 +171,14 @@ function enqueue_comment_hotkeys_js() { if ( 'true' == get_user_option( 'comment_shortcuts' ) ) wp_enqueue_script( 'jquery-table-hotkeys' ); } + +/** + * Display error message at bottom of comments. + * + * @param string $msg Error Message. Assumed to contain HTML and be sanitized. + */ +function comment_footer_die( $msg ) { + echo "

$msg

"; + include( ABSPATH . 'wp-admin/admin-footer.php' ); + die; +} \ No newline at end of file diff --git a/wp-includes/version.php b/wp-includes/version.php index 2cecd17c6d..82b17b17e3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34018'; +$wp_version = '4.4-alpha-34019'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.