Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2015-09-10 21:29:24 +00:00
parent a1d949f361
commit f0b95b7bcc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/comment.php
View File

@ -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 "<div class='wrap'><p>$msg</p></div>";
include( ABSPATH . 'wp-admin/admin-footer.php' );
die;
}
switch( $action ) {
case 'editcomment' :

11
wp-admin/includes/comment.php
View File

@ -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 "<div class='wrap'><p>$msg</p></div>";
include( ABSPATH . 'wp-admin/admin-footer.php' );
die;
}

2
wp-includes/version.php
View File

@ -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.