Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Comments: When setting the colspan value for inline edit/reply, make sure it's actually a table and the value is not empty.

Browse Source 
Props afercia.
Fixes #33596.
Built from https://develop.svn.wordpress.org/trunk@34179


git-svn-id: http://core.svn.wordpress.org/trunk@34147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-09-15 13:44:34 +00:00
parent a5a8ae45a6
commit 80165bfc4a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/js/edit-comments.js
View File

@ -623,7 +623,8 @@ commentReply = {
var editRow, rowData, act, replyButton, editHeight,
t = this,
c = $('#comment-' + comment_id),
h = c.height();
h = c.height(),
colspanVal = 0;
t.close();
t.cid = comment_id;
@ -633,8 +634,12 @@ commentReply = {
action = action || 'replyto';
act = 'edit' == action ? 'edit' : 'replyto';
act = t.act = act + '-comment';
colspanVal = $( 'th:visible, td:visible', c ).length;
$( 'td', editRow ).attr( 'colspan', $( 'th:visible, td:visible', c ).length );
// Make sure it's actually a table and there's a `colspan` value to apply.
if ( editRow.hasClass( 'inline-edit-row' ) && 0 !== colspanVal ) {
$( 'td', editRow ).attr( 'colspan', colspanVal );
}
$('#action', editRow).val(act);
$('#comment_post_ID', editRow).val(post_id);

2
wp-admin/js/edit-comments.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34178';
$wp_version = '4.4-alpha-34179';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.