<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[17832] trunk: Change comment Reply to Approve and Reply and auto-approve the comment if it is in moderation, props DH-Shredder, fixes #15898</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17832">17832</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-05-07 04:56:00 +0000 (Sat, 07 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change comment Reply to Approve and Reply and auto-approve the comment if it is in moderation, props DH-Shredder, fixes <a href="http://trac.wordpress.org/ticket/15898">#15898</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminjseditcommentsdevjs">trunk/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#trunkwpadminjseditcommentsjs">trunk/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (17831 => 17832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2011-05-07 03:26:23 UTC (rev 17831)
+++ trunk/wp-admin/admin-ajax.php 2011-05-07 04:56:00 UTC (rev 17832)
</span><span class="lines">@@ -666,10 +666,8 @@
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="cx"> if ( ! $comment ) die('1');
</span><span class="cx">
</span><del>- $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
</del><ins>+ $position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
</ins><span class="cx">
</span><del>- $x = new WP_Ajax_Response();
-
</del><span class="cx"> ob_start();
</span><span class="cx"> if ( 'dashboard' == $_REQUEST['mode'] ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
</span><span class="lines">@@ -685,13 +683,25 @@
</span><span class="cx"> $comment_list_item = ob_get_contents();
</span><span class="cx"> ob_end_clean();
</span><span class="cx">
</span><del>- $x->add( array(
</del><ins>+ $response = array(
</ins><span class="cx"> 'what' => 'comment',
</span><span class="cx"> 'id' => $comment->comment_ID,
</span><span class="cx"> 'data' => $comment_list_item,
</span><span class="cx"> 'position' => $position
</span><del>- ));
</del><ins>+ );
</ins><span class="cx">
</span><ins>+ // automatically approve parent comment
+ if ( !empty($_POST['approve_parent']) ) {
+ $parent = get_comment( $comment_parent );
+
+ if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
+ if ( wp_set_comment_status( $parent->comment_ID, 'approve' ) )
+ $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID );
+ }
+ }
+
+ $x = new WP_Ajax_Response();
+ $x->add( $response );
</ins><span class="cx"> $x->send();
</span><span class="cx"> break;
</span><span class="cx"> case 'edit-comment' :
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.dev.js (17831 => 17832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.dev.js 2011-05-07 03:26:23 UTC (rev 17831)
+++ trunk/wp-admin/js/edit-comments.dev.js 2011-05-07 04:56:00 UTC (rev 17832)
</span><span class="lines">@@ -1,21 +1,32 @@
</span><del>-var theList, theExtraList, toggleWithKeyboard = false;
</del><ins>+var theList, theExtraList, toggleWithKeyboard = false, getCount, updateCount, updatePending, dashboardTotals;
</ins><span class="cx"> (function($) {
</span><span class="cx">
</span><span class="cx"> setCommentsList = function() {
</span><del>- var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter;
</del><ins>+ var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList;
</ins><span class="cx">
</span><span class="cx"> totalInput = $('input[name="_total"]', '#comments-form');
</span><span class="cx"> perPageInput = $('input[name="_per_page"]', '#comments-form');
</span><span class="cx"> pageInput = $('input[name="_page"]', '#comments-form');
</span><span class="cx">
</span><span class="cx"> dimAfter = function( r, settings ) {
</span><del>- var c = $('#' + settings.element);
</del><ins>+ var c = $('#' + settings.element), editRow, replyID, replyButton;
</ins><span class="cx">
</span><del>- if ( c.is('.unapproved') )
- c.find('div.comment_status').html('0')
- else
- c.find('div.comment_status').html('1')
</del><ins>+ editRow = $('#replyrow');
+ replyID = $('#comment_ID', editRow).val();
+ replyButton = $('#replybtn', editRow);
</ins><span class="cx">
</span><ins>+ if ( c.is('.unapproved') ) {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.replyApprove);
+
+ c.find('div.comment_status').html('0');
+ } else {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.reply);
+
+ c.find('div.comment_status').html('1');
+ }
+
</ins><span class="cx"> $('span.pending-count').each( function() {
</span><span class="cx"> var a = $(this), n, dif;
</span><span class="cx"> n = a.html().replace(/[^0-9]+/g, '');
</span><span class="lines">@@ -99,7 +110,7 @@
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><del>- function dashboardTotals(n) {
</del><ins>+ dashboardTotals = function(n) {
</ins><span class="cx"> var dash = $('#dashboard_right_now'), total, appr, totalN, apprN;
</span><span class="cx">
</span><span class="cx"> n = n || 0;
</span><span class="lines">@@ -115,16 +126,16 @@
</span><span class="cx"> updateCount(total, totalN);
</span><span class="cx"> updateCount(appr, apprN);
</span><span class="cx">
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><del>- function getCount(el) {
</del><ins>+ getCount = function(el) {
</ins><span class="cx"> var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
</span><span class="cx"> if ( isNaN(n) )
</span><span class="cx"> return 0;
</span><span class="cx"> return n;
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><del>- function updateCount(el, n) {
</del><ins>+ updateCount = function(el, n) {
</ins><span class="cx"> var n1 = '';
</span><span class="cx"> if ( isNaN(n) )
</span><span class="cx"> return;
</span><span class="lines">@@ -137,11 +148,26 @@
</span><span class="cx"> n = n + n1;
</span><span class="cx"> }
</span><span class="cx"> el.html(n);
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><ins>+ updatePending = function(n) {
+ $('span.pending-count').each( function() {
+ var a = $(this);
+
+ if ( n < 0 )
+ n = 0;
+
+ a.closest('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+ updateCount(a, n);
+ dashboardTotals();
+ });
+ };
+
</ins><span class="cx"> // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
</span><span class="cx"> delAfter = function( r, settings ) {
</span><del>- var total, pageLinks, N, untrash = $(settings.target).parent().is('span.untrash'), unspam = $(settings.target).parent().is('span.unspam'), spam, trash;
</del><ins>+ var total, N, untrash = $(settings.target).parent().is('span.untrash'),
+ unspam = $(settings.target).parent().is('span.unspam'), spam, trash, pending,
+ unapproved = $('#' + settings.element).is('.unapproved');
</ins><span class="cx">
</span><span class="cx"> function getUpdate(s) {
</span><span class="cx"> if ( $(settings.target).parent().is('span.' + s) )
</span><span class="lines">@@ -151,6 +177,7 @@
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> spam = getUpdate('spam');
</span><span class="cx"> trash = getUpdate('trash');
</span><span class="cx">
</span><span class="lines">@@ -159,20 +186,16 @@
</span><span class="cx"> if ( unspam )
</span><span class="cx"> spam = -1;
</span><span class="cx">
</span><del>- $('span.pending-count').each( function() {
- var a = $(this), n = getCount(a), unapproved = $('#' + settings.element).is('.unapproved');
</del><ins>+ pending = getCount( $('span.pending-count').eq(0) );
</ins><span class="cx">
</span><del>- if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
- n = n + 1;
- } else if ( unapproved ) { // we deleted a formerly unapproved comment
- n = n - 1;
- }
- if ( n < 0 ) { n = 0; }
- a.closest('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
- updateCount(a, n);
- dashboardTotals();
- });
</del><ins>+ if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
+ pending = pending + 1;
+ } else if ( unapproved ) { // we deleted a formerly unapproved comment
+ pending = pending - 1;
+ }
</ins><span class="cx">
</span><ins>+ updatePending(pending);
+
</ins><span class="cx"> $('span.spam-count').each( function() {
</span><span class="cx"> var a = $(this), n = getCount(a) + spam;
</span><span class="cx"> updateCount(a, n);
</span><span class="lines">@@ -215,9 +238,8 @@
</span><span class="cx"> refillTheExtraList();
</span><span class="cx"> };
</span><span class="cx">
</span><del>- var refillTheExtraList = function(ev) {
- // var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name="_per_page"]', '#comments-form').val(), r;
- var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name="_per_page"]', '#comments-form').val(), r;
</del><ins>+ refillTheExtraList = function(ev) {
+ var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name="_per_page"]', '#comments-form').val();
</ins><span class="cx">
</span><span class="cx"> if (! args.paged)
</span><span class="cx"> args.paged = 1;
</span><span class="lines">@@ -267,7 +289,6 @@
</span><span class="cx"> if ( s.target.className.indexOf(':trash=1') != -1 || s.target.className.indexOf(':spam=1') != -1 )
</span><span class="cx"> $('#undo-' + id).fadeIn(300, function(){ $(this).show() });
</span><span class="cx"> });
</span><del>- // $(listTable).bind('changePage', refillTheExtraList);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> commentReply = {
</span><span class="lines">@@ -355,7 +376,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> open : function(id, p, a) {
</span><del>- var t = this, editRow, rowData, act, h, c = $('#comment-' + id);
</del><ins>+ var t = this, editRow, rowData, act, h, c = $('#comment-' + id), replyButton;
+
</ins><span class="cx"> t.close();
</span><span class="cx"> t.cid = id;
</span><span class="cx">
</span><span class="lines">@@ -387,22 +409,20 @@
</span><span class="cx"> $('#replyrow').fadeIn(300, function(){ $(this).show() });
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><ins>+ replyButton = $('#replybtn', editRow);
</ins><span class="cx"> $('#edithead, #savebtn', editRow).hide();
</span><span class="cx"> $('#replyhead, #replybtn', editRow).show();
</span><span class="cx"> c.after(editRow);
</span><ins>+
+ if ( c.hasClass('unapproved') ) {
+ replyButton.text(adminCommentsL10n.replyApprove);
+ } else {
+ replyButton.text(adminCommentsL10n.reply);
+ }
+
</ins><span class="cx"> $('#replyrow').fadeIn(300, function(){ $(this).show() });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $.browser.msie )
- $('#replycontainer').resizable({
- handles : 's',
- axis : 'y',
- minHeight : 80,
- stop : function() {
- $('#replycontainer').width('auto');
- }
- });
-
</del><span class="cx"> setTimeout(function() {
</span><span class="cx"> var rtop, rbottom, scrollTop, vp, scrollBottom;
</span><span class="cx">
</span><span class="lines">@@ -441,6 +461,9 @@
</span><span class="cx"> post.comments_listing = this.comments_listing;
</span><span class="cx"> post.p = $('[name="p"]').val();
</span><span class="cx">
</span><ins>+ if ( $('#comment-' + $('#comment_ID').val()).hasClass('unapproved') )
+ post.approve_parent = 1;
+
</ins><span class="cx"> $.ajax({
</span><span class="cx"> type : 'POST',
</span><span class="cx"> url : ajaxurl,
</span><span class="lines">@@ -453,37 +476,50 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> show : function(xml) {
</span><del>- var r, c, id, bg;
</del><ins>+ var t = this, r, c, id, bg, pid;
</ins><span class="cx">
</span><span class="cx"> if ( typeof(xml) == 'string' ) {
</span><del>- this.error({'responseText': xml});
</del><ins>+ t.error({'responseText': xml});
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> r = wpAjax.parseAjaxResponse(xml);
</span><span class="cx"> if ( r.errors ) {
</span><del>- this.error({'responseText': wpAjax.broken});
</del><ins>+ t.error({'responseText': wpAjax.broken});
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> r = r.responses[0];
</span><span class="cx"> c = r.data;
</span><span class="cx"> id = '#comment-' + r.id;
</span><del>- if ( 'edit-comment' == this.act )
</del><ins>+ if ( 'edit-comment' == t.act )
</ins><span class="cx"> $(id).remove();
</span><span class="cx">
</span><span class="cx"> $(c).hide()
</span><span class="cx"> $('#replyrow').after(c);
</span><span class="cx">
</span><del>- this.revert();
- this.addEvents($(id));
- bg = $(id).hasClass('unapproved') ? '#ffffe0' : '#fff';
</del><ins>+ if ( r.supplemental.parent_approved ) {
+ pid = '#comment-' + r.supplemental.parent_approved;
+ updatePending( getCount( $('span.pending-count').eq(0) ) - 1 );
+ }
</ins><span class="cx">
</span><ins>+ t.revert();
+ t.addEvents($(id));
+ bg = $(id).hasClass('unapproved') ? '#FFFFE0' : '#FFFFFF';
+
</ins><span class="cx"> $(id)
</span><del>- .animate( { 'backgroundColor':'#CCEEBB' }, 600 )
- .animate( { 'backgroundColor': bg }, 600 );
</del><ins>+ .animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+ .animate( { 'backgroundColor': bg }, 300, function() {
+ if ( pid ) {
+ pid = $(pid)
+ .animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+ .animate( { 'backgroundColor': '#FFFFFF' }, 300 )
+ .removeClass('unapproved').addClass('approved');
</ins><span class="cx">
</span><del>- // $.fn.wpList.process($(id));
</del><ins>+ pid.find('div.comment_status').html('1');
+ }
+ });
+
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> error : function(r) {
</span></span></pre></div>
<a id="trunkwpadminjseditcommentsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/edit-comments.js (17831 => 17832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/edit-comments.js 2011-05-07 03:26:23 UTC (rev 17831)
+++ trunk/wp-admin/js/edit-comments.js 2011-05-07 04:56:00 UTC (rev 17832)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var theList,theExtraList,toggleWithKeyboard=false;(function(a){setCommentsList=function(){var d,f,i,m=0,h,j,e,l;d=a('input[name="_total"]',"#comments-form");f=a('input[name="_per_page"]',"#comments-form");i=a('input[name="_page"]',"#comments-form");h=function(o,n){var p=a("#"+n.element);if(p.is(".unapproved")){p.find("div.comment_status").html("0")}else{p.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var q=a(this),s,r;s=q.html().replace(/[^0-9]+/g,"");s=parseInt(s,10);if(isNaN(s)){return}r=a("#"+n.element).is("."+n.dimClass)?1:-1;s=s+r;if(s<0){s=0}q.closest("#awaiting-mod")[0==s?"addClass":"removeClass"]("count-0");g(q,s);k()})};j=function(r,v){var x=a(r.target).attr("className"),o,p,q,u,w,t,s=false;r.data._total=d.val()||0
;r.data._per_page=f.val()||0;r.data._page=i.val()||0;r.data._url=document.location.href;r.data.comment_status=a('input[name="comment_status"]',"#comments-form").val();if(x.indexOf(":trash=1")!=-1){s="trash"}else{if(x.indexOf(":spam=1")!=-1){s="spam"}}if(s){o=x.replace(/.*?comment-([0-9]+).*/,"$1");p=a("#comment-"+o);note=a("#"+s+"-undo-holder").html();p.find(".check-column :checkbox").attr("checked","");if(p.siblings("#replyrow").length&&commentReply.cid==o){commentReply.close()}if(p.is("tr")){q=p.children(":visible").length;t=a(".author strong",p).text();u=a('<tr id="undo-'+o+'" class="undo un'+s+'" style="display:none;"><td colspan="'+q+'">'+note+"</td></tr>")}else{t=a(".comment-author",p).text();u=a('<div id=&qu
ot;undo-'+o+'" style="display:none;" class="undo un'+s+'">'+note+"</div>")}p.before(u);a("strong","#undo-"+o).text(t+" ");w=a(".undo a","#undo-"+o);w.attr("href","comment.php?action=un"+s+"comment&c="+o+"&_wpnonce="+r.data._ajax_nonce);w.attr("className","delete:the-comment-list:comment-"+o+"::un"+s+"=1 vim-z vim-destructive");a(".avatar",p).clone().prependTo("#undo-"+o+" ."+s+"-undo-inside");w.click(function(){v.wpList.del(this);a("#undo-"+o).css({backgroundColor:"#ceb"}).fadeOut(350,function(){a(this).remove();a("#comment-"+o).css("backgroundColor","").fadeIn(300,function(){a(this).show()})});return false})}return r};e=function(n,o,p){if(o<m){return}if(p){m=o}d.val(n.toString());a("span.total-type-
count").each(function(){g(a(this),n)})};function k(t){var s=a("#dashboard_right_now"),p,r,q,o;t=t||0;if(isNaN(t)||!s.length){return}p=a("span.total-count",s);r=a("span.approved-count",s);q=c(p);q=q+t;o=q-c(a("span.pending-count",s))-c(a("span.spam-count",s));g(p,q);g(r,o)}function c(o){var p=parseInt(o.html().replace(/[^0-9]+/g,""),10);if(isNaN(p)){return 0}return p}function g(p,q){var o="";if(isNaN(q)){return}q=q<1?"0":q.toString();if(q.length>3){while(q.length>3){o=thousandsSeparator+q.substr(q.length-3)+o;q=q.substr(0,q.length-3)}q=q+o}p.html(q)}l=function(n,p){var u,q,s,w=a(p.target).parent().is("span.untrash"),o=a(p.target).parent().is("span.unspam"),v,t;function x(r){if(a(p.target).parent().is("span."+r)){return 1}else{if(a("#"+p.element).is("."+r)){return -1}}return 0}v=x("spam");t=x("trash");if(w){t=-1}if(
o){v=-1}a("span.pending-count").each(function(){var r=a(this),z=c(r),y=a("#"+p.element).is(".unapproved");if(a(p.target).parent().is("span.unapprove")||((w||o)&&y)){z=z+1}else{if(y){z=z-1}}if(z<0){z=0}r.closest("#awaiting-mod")[0==z?"addClass":"removeClass"]("count-0");g(r,z);k()});a("span.spam-count").each(function(){var r=a(this),y=c(r)+v;g(r,y)});a("span.trash-count").each(function(){var r=a(this),y=c(r)+t;g(r,y)});if(a("#dashboard_right_now").length){s=t?-1*t:0;k(s)}else{u=d.val()?parseInt(d.val(),10):0;u=u-v-t;if(u<0){u=0}if(("object"==typeof n)&&m<p.parsed.responses[0].supplemental.time){total_items_i18n=p.parsed.responses[0].supplemental.total_items_i18n||"";if(total_items_i18n){a(".displaying-num").text(total_items_i18n);a(".total-pages").text(p.parsed.responses[0].supplemental.total_pages_i18n)
;a(".tablenav-pages").find(".next-page, .last-page").toggleClass("disabled",p.parsed.responses[0].supplemental.total_pages==a(".current-page").val())}e(u,p.parsed.responses[0].supplemental.time,true)}else{e(u,n,false)}}if(!theExtraList||theExtraList.size()==0||theExtraList.children().size()==0||w||o){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());b()};var b=function(s){var o=a.query.get(),n=a(".total-pages").text(),p=a('input[name="_per_page"]',"#comments-form").val(),q;if(!o.paged){o.paged=1}if(o.paged>n){return}if(s){theExtraList.empty();o.number=Math.min(8,p)}else{o.number=1;o.offset=Math.min(8,p)-1}o.no_placeholder=true;o.paged++;if(true===o.comment_type){o.comment_type=""}o=a.extend(o,{action:"fetch-list",list_args:list_args,_ajax_fetch_list_nonce:a("#_ajax_fetch_list_nonce").val()});a.ajax({url:ajaxurl,global:false,dataTyp
e:"json",data:o,success:function(r){theExtraList.get(0).wpList.add(r.rows)}})};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:j,dimAfter:h,delAfter:l,addColor:"none"}).bind("wpListDelEnd",function(o,n){var p=n.element.replace(/[^0-9]+/g,"");if(n.target.className.indexOf(":trash=1")!=-1||n.target.className.indexOf(":spam=1")!=-1){a("#undo-"+p).fadeIn(300,function(){a(this).show()})}})};commentReply={cid:"",act:"",init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preve
ntDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find(".column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){var b;if(this.cid){b=a("#comment-"+this.cid);if(this.act=="edit-comment"){b.fadeIn(300,func
tion(){b.show()}).css("backgroundColor","")}a("#replyrow").hide();a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("input","#edithead").val("");a(".error","#replysubmit").html("").hide();a(".waiting","#replysubmit").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("height","120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}this.cid=""}},open:function(b,d,k){var l=this,e,f,i,g,j=a("#comment-"+b);l.close();l.cid=b;e=a("#replyrow");f=a("#inline-"+b);i=l.act=(k=="edit")?"edit-comment":"replyto-comment";a("#action",e).val(i);a("#comment_post_ID",e).val(d);a("#comment_ID",e).val(b);if(k=="edit")
{a("#author",e).val(a("div.author",f).text());a("#author-email",e).val(a("div.author-email",f).text());a("#author-url",e).val(a("div.author-url",f).text());a("#status",e).val(a("div.comment_status",f).text());a("#replycontent",e).val(a("textarea.comment",f).val());a("#edithead, #savebtn",e).show();a("#replyhead, #replybtn",e).hide();g=j.height();if(g>220){if(a.browser.msie){a("#replycontainer, #replycontent",e).height(g-105)}else{a("#replycontainer",e).height(g-105)}}j.after(e).fadeOut("fast",function(){a("#replyrow").fadeIn(300,function(){a(this).show()})})}else{a("#edithead, #savebtn",e).hide();a("#replyhead, #replybtn",e).show();j.after(e);a("#replyrow").fadeIn(300,function(){a(this).show()})}if(!a.browser.msie){a("#replycontainer").resizable({handles:"s",axis:&q
uot;y",minHeight:80,stop:function(){a("#replycontainer").width("auto")}})}setTimeout(function(){var n,h,o,c,m;n=a("#replyrow").offset().top;h=n+a("#replyrow").height();o=window.pageYOffset||document.documentElement.scrollTop;c=document.documentElement.clientHeight||self.innerHeight||0;m=o+c;if(m-20<h){window.scroll(0,h-c+35)}else{if(n-20<o){window.scroll(0,n-35)}}a("#replycontent").focus().keyup(function(p){if(p.which==27){commentReply.revert()}})},600);return false},send:function(){var b={};a("#replysubmit .error").hide();a("#replysubmit .waiting").show();a("#replyrow input").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;b.p=a('[name="p"]').val();a.ajax({type:"POST",url:ajaxurl,data:b,success:function(c){commentReply.show(c)},error:functi
on(c){commentReply.error(c)}});return false},show:function(b){var e,g,f,d;if(typeof(b)=="string"){this.error({responseText:b});return false}e=wpAjax.parseAjaxResponse(b);if(e.errors){this.error({responseText:wpAjax.broken});return false}e=e.responses[0];g=e.data;f="#comment-"+e.id;if("edit-comment"==this.act){a(f).remove()}a(g).hide();a("#replyrow").after(g);this.revert();this.addEvents(a(f));d=a(f).hasClass("unapproved")?"#ffffe0":"#fff";a(f).animate({backgroundColor:"#CCEEBB"},600).animate({backgroundColor:d},600)},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a(document).delegate("span.delete a.delete","click",function(){
return false});if(typeof QTags!="undefined"){ed_reply=new QTags("ed_reply","replycontent","replycontainer","more")}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a(".tablenav-pages ."+f+"-page:not(.disabled)");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("input:checkbox","#cb").click().attr("checked","");toggleWithKeyboard=false};d=function(f){return function(){var g=a('select[name="action"]');a('option[value="'+f+'"]',g).attr("selected","selected");a("#doaction").click()}};a.table_ho
tkeys(a("table.widefat"),["a","u","s","d","r","q","z",["e",b],["shift+x",c],["shift+a",d("approve")],["shift+s",d("spam")],["shift+d",d("delete")],["shift+t",d("trash")],["shift+z",d("untrash")],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+var theList,theExtraList,toggleWithKeyboard=false,getCount,updateCount,updatePending,dashboardTotals;(function(a){setCommentsList=function(){var c,e,g,j=0,f,h,d,i,b;c=a('input[name="_total"]',"#comments-form");e=a('input[name="_per_page"]',"#comments-form");g=a('input[name="_page"]',"#comments-form");f=function(n,l){var p=a("#"+l.element),k,o,m;k=a("#replyrow");o=a("#comment_ID",k).val();m=a("#replybtn",k);if(p.is(".unapproved")){if(l.data.id==o){m.text(adminCommentsL10n.replyApprove)}p.find("div.comment_status").html("0")}else{if(l.data.id==o){m.text(adminCommentsL10n.reply)}p.find("div.comment_status").html("1")}a("span.pending-count").each(function(){var q=a(this),s,r;s=q.html().replace(/[^0-9]+/g,"");s=parseInt(s,10);if(isNaN(s)){return}r=a("#"+l.element).is("."+l.dimClass
)?1:-1;s=s+r;if(s<0){s=0}q.closest("#awaiting-mod")[0==s?"addClass":"removeClass"]("count-0");updateCount(q,s);dashboardTotals()})};h=function(o,s){var u=a(o.target).attr("className"),k,l,m,r,t,q,p=false;o.data._total=c.val()||0;o.data._per_page=e.val()||0;o.data._page=g.val()||0;o.data._url=document.location.href;o.data.comment_status=a('input[name="comment_status"]',"#comments-form").val();if(u.indexOf(":trash=1")!=-1){p="trash"}else{if(u.indexOf(":spam=1")!=-1){p="spam"}}if(p){k=u.replace(/.*?comment-([0-9]+).*/,"$1");l=a("#comment-"+k);note=a("#"+p+"-undo-holder").html();l.find(".check-column :checkbox").attr("checked","");if(l.siblings("#replyrow").length&&commentReply.cid==k){commentReply.close()}if(l.is("tr")){m=l.children(":visible").length;q=a("
;.author strong",l).text();r=a('<tr id="undo-'+k+'" class="undo un'+p+'" style="display:none;"><td colspan="'+m+'">'+note+"</td></tr>")}else{q=a(".comment-author",l).text();r=a('<div id="undo-'+k+'" style="display:none;" class="undo un'+p+'">'+note+"</div>")}l.before(r);a("strong","#undo-"+k).text(q+" ");t=a(".undo a","#undo-"+k);t.attr("href","comment.php?action=un"+p+"comment&c="+k+"&_wpnonce="+o.data._ajax_nonce);t.attr("className","delete:the-comment-list:comment-"+k+"::un"+p+"=1 vim-z vim-destructive");a(".avatar",l).clone().prependTo("#undo-"+k+" ."+p+"-undo-inside");t.click(function(){s.wpList.del(this);a("#undo-"+k).css({backgroundColor:"#
ceb"}).fadeOut(350,function(){a(this).remove();a("#comment-"+k).css("backgroundColor","").fadeIn(300,function(){a(this).show()})});return false})}return o};d=function(k,l,m){if(l<j){return}if(m){j=l}c.val(k.toString());a("span.total-type-count").each(function(){updateCount(a(this),k)})};dashboardTotals=function(q){var p=a("#dashboard_right_now"),l,o,m,k;q=q||0;if(isNaN(q)||!p.length){return}l=a("span.total-count",p);o=a("span.approved-count",p);m=getCount(l);m=m+q;k=m-getCount(a("span.pending-count",p))-getCount(a("span.spam-count",p));updateCount(l,m);updateCount(o,k)};getCount=function(k){var l=parseInt(k.html().replace(/[^0-9]+/g,""),10);if(isNaN(l)){return 0}return l};updateCount=function(l,m){var k="";if(isNaN(m)){return}m=m<1?"0":m.toString();if(m.length>3){while(m.length>3){k=thousandsSeparator+m.substr(m.length-3)+k;m=m.substr(0,m.l
ength-3)}m=m+k}l.html(m)};updatePending=function(k){a("span.pending-count").each(function(){var l=a(this);if(k<0){k=0}l.closest("#awaiting-mod")[0==k?"addClass":"removeClass"]("count-0");updateCount(l,k);dashboardTotals()})};i=function(k,n){var q,o,u=a(n.target).parent().is("span.untrash"),m=a(n.target).parent().is("span.unspam"),t,s,l,p=a("#"+n.element).is(".unapproved");function v(r){if(a(n.target).parent().is("span."+r)){return 1}else{if(a("#"+n.element).is("."+r)){return -1}}return 0}t=v("spam");s=v("trash");if(u){s=-1}if(m){t=-1}l=getCount(a("span.pending-count").eq(0));if(a(n.target).parent().is("span.unapprove")||((u||m)&&p)){l=l+1}else{if(p){l=l-1}}updatePending(l);a("span.spam-count").each(function(){var r=a(this),w=getCount(r)+t;updateCount(r,w)});a("span.trash-count").each(fun
ction(){var r=a(this),w=getCount(r)+s;updateCount(r,w)});if(a("#dashboard_right_now").length){o=s?-1*s:0;dashboardTotals(o)}else{q=c.val()?parseInt(c.val(),10):0;q=q-t-s;if(q<0){q=0}if(("object"==typeof k)&&j<n.parsed.responses[0].supplemental.time){total_items_i18n=n.parsed.responses[0].supplemental.total_items_i18n||"";if(total_items_i18n){a(".displaying-num").text(total_items_i18n);a(".total-pages").text(n.parsed.responses[0].supplemental.total_pages_i18n);a(".tablenav-pages").find(".next-page, .last-page").toggleClass("disabled",n.parsed.responses[0].supplemental.total_pages==a(".current-page").val())}d(q,n.parsed.responses[0].supplemental.time,true)}else{d(q,k,false)}}if(!theExtraList||theExtraList.size()==0||theExtraList.children().size()==0||u||m){return}theList.get(0).wpList.add(theExtraList.children(":eq(0)").remove().clone());b()};b=function(n){var l=a.
query.get(),k=a(".total-pages").text(),m=a('input[name="_per_page"]',"#comments-form").val();if(!l.paged){l.paged=1}if(l.paged>k){return}if(n){theExtraList.empty();l.number=Math.min(8,m)}else{l.number=1;l.offset=Math.min(8,m)-1}l.no_placeholder=true;l.paged++;if(true===l.comment_type){l.comment_type=""}l=a.extend(l,{action:"fetch-list",list_args:list_args,_ajax_fetch_list_nonce:a("#_ajax_fetch_list_nonce").val()});a.ajax({url:ajaxurl,global:false,dataType:"json",data:l,success:function(o){theExtraList.get(0).wpList.add(o.rows)}})};theExtraList=a("#the-extra-comment-list").wpList({alt:"",delColor:"none",addColor:"none"});theList=a("#the-comment-list").wpList({alt:"",delBefore:h,dimAfter:f,delAfter:i,addColor:"none"}).bind("wpListDelEnd",function(l,k){var m=k.element.replace(/[^0-9]+/g,"");if(k.target.className.index
Of(":trash=1")!=-1||k.target.className.indexOf(":spam=1")!=-1){a("#undo-"+m).fadeIn(300,function(){a(this).show()})}})};commentReply={cid:"",act:"",init:function(){var b=a("#replyrow");a("a.cancel",b).click(function(){return commentReply.revert()});a("a.save",b).click(function(){return commentReply.send()});a("input#author, input#author-email, input#author-url",b).keypress(function(c){if(c.which==13){commentReply.send();c.preventDefault();return false}});a("#the-comment-list .column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())});a("#doaction, #doaction2, #post-query-submit").click(function(c){if(a("#the-comment-list #replyrow").length>0){commentReply.close()}});this.comments_listing=a('#comments-form > input[name="comment_status"]').val()||""},addEvents:function(b){b.each(function(){a(this).find("
.column-comment > p").dblclick(function(){commentReply.toggle(a(this).parent())})})},toggle:function(b){if(a(b).css("display")!="none"){a(b).find("a.vim-q").click()}},revert:function(){if(a("#the-comment-list #replyrow").length<1){return false}a("#replyrow").fadeOut("fast",function(){commentReply.close()});return false},close:function(){var b;if(this.cid){b=a("#comment-"+this.cid);if(this.act=="edit-comment"){b.fadeIn(300,function(){b.show()}).css("backgroundColor","")}a("#replyrow").hide();a("#com-reply").append(a("#replyrow"));a("#replycontent").val("");a("input","#edithead").val("");a(".error","#replysubmit").html("").hide();a(".waiting","#replysubmit").hide();if(a.browser.msie){a("#replycontainer, #replycontent").css("h
eight","120px")}else{a("#replycontainer").resizable("destroy").css("height","120px")}this.cid=""}},open:function(b,d,k){var m=this,e,f,i,g,j=a("#comment-"+b),l;m.close();m.cid=b;e=a("#replyrow");f=a("#inline-"+b);i=m.act=(k=="edit")?"edit-comment":"replyto-comment";a("#action",e).val(i);a("#comment_post_ID",e).val(d);a("#comment_ID",e).val(b);if(k=="edit"){a("#author",e).val(a("div.author",f).text());a("#author-email",e).val(a("div.author-email",f).text());a("#author-url",e).val(a("div.author-url",f).text());a("#status",e).val(a("div.comment_status",f).text());a("#replycontent",e).val(a("textarea.comment",f).val());a("#edithead, #savebtn",e).show();a("#replyhead, #replybtn",e).hide();g=j.height(
);if(g>220){if(a.browser.msie){a("#replycontainer, #replycontent",e).height(g-105)}else{a("#replycontainer",e).height(g-105)}}j.after(e).fadeOut("fast",function(){a("#replyrow").fadeIn(300,function(){a(this).show()})})}else{l=a("#replybtn",e);a("#edithead, #savebtn",e).hide();a("#replyhead, #replybtn",e).show();j.after(e);if(j.hasClass("unapproved")){l.text(adminCommentsL10n.replyApprove)}else{l.text(adminCommentsL10n.reply)}a("#replyrow").fadeIn(300,function(){a(this).show()})}setTimeout(function(){var o,h,p,c,n;o=a("#replyrow").offset().top;h=o+a("#replyrow").height();p=window.pageYOffset||document.documentElement.scrollTop;c=document.documentElement.clientHeight||self.innerHeight||0;n=p+c;if(n-20<h){window.scroll(0,h-c+35)}else{if(o-20<p){window.scroll(0,o-35)}}a("#replycontent").focus().keyup(function(q){if(q.which==27){commentReply.revert()}})
},600);return false},send:function(){var b={};a("#replysubmit .error").hide();a("#replysubmit .waiting").show();a("#replyrow input").each(function(){b[a(this).attr("name")]=a(this).val()});b.content=a("#replycontent").val();b.id=b.comment_post_ID;b.comments_listing=this.comments_listing;b.p=a('[name="p"]').val();if(a("#comment-"+a("#comment_ID").val()).hasClass("unapproved")){b.approve_parent=1}a.ajax({type:"POST",url:ajaxurl,data:b,success:function(c){commentReply.show(c)},error:function(c){commentReply.error(c)}});return false},show:function(d){var f=this,g,i,h,e,b;if(typeof(d)=="string"){f.error({responseText:d});return false}g=wpAjax.parseAjaxResponse(d);if(g.errors){f.error({responseText:wpAjax.broken});return false}g=g.responses[0];i=g.data;h="#comment-"+g.id;if("edit-comment"==f.act){a(h).remove()}a(i).hide();a("#replyrow").after(
i);if(g.supplemental.parent_approved){b="#comment-"+g.supplemental.parent_approved;updatePending(getCount(a("span.pending-count").eq(0))-1)}f.revert();f.addEvents(a(h));e=a(h).hasClass("unapproved")?"#FFFFE0":"#FFFFFF";a(h).animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:e},300,function(){if(b){b=a(b).animate({backgroundColor:"#CCEEBB"},300).animate({backgroundColor:"#FFFFFF"},300).removeClass("unapproved").addClass("approved");b.find("div.comment_status").html("1")}})},error:function(b){var c=b.statusText;a("#replysubmit .waiting").hide();if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#replysubmit .error").html(c).show()}}};a(document).ready(function(){var e,b,c,d;setCommentsList();commentReply.init();a(document).delegate("span.delete a.delete","click",f
unction(){return false});if(typeof QTags!="undefined"){ed_reply=new QTags("ed_reply","replycontent","replycontainer","more")}if(typeof a.table_hotkeys!="undefined"){e=function(f){return function(){var h,g;h="next"==f?"first":"last";g=a(".tablenav-pages ."+f+"-page:not(.disabled)");if(g.length){window.location=g[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g,"")+"&hotkeys_highlight_"+h+"=1"}}};b=function(g,f){window.location=a("span.edit a",f).attr("href")};c=function(){toggleWithKeyboard=true;a("input:checkbox","#cb").click().attr("checked","");toggleWithKeyboard=false};d=function(f){return function(){var g=a('select[name="action"]');a('option[value="'+f+'"]',g).attr("selected","selected");a("#doaction").click()}};
a.table_hotkeys(a("table.widefat"),["a","u","s","d","r","q","z",["e",b],["shift+x",c],["shift+a",d("approve")],["shift+s",d("spam")],["shift+d",d("delete")],["shift+t",d("trash")],["shift+z",d("untrash")],["shift+u",d("unapprove")]],{highlight_first:adminCommentsL10n.hotkeys_highlight_first,highlight_last:adminCommentsL10n.hotkeys_highlight_last,prev_page_link_cb:e("prev"),next_page_link_cb:e("next")})}})})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (17831 => 17832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-05-07 03:26:23 UTC (rev 17831)
+++ trunk/wp-includes/script-loader.php 2011-05-07 04:56:00 UTC (rev 17832)
</span><span class="lines">@@ -313,11 +313,13 @@
</span><span class="cx"> $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429' );
</span><span class="cx"> $scripts->add_data( 'admin-custom-fields', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110429' );
</del><ins>+ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110506' );
</ins><span class="cx"> $scripts->add_data( 'admin-comments', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
</span><span class="cx"> 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
</span><del>- 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
</del><ins>+ 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
+ 'replyApprove' => __( 'Approve and Reply' ),
+ 'reply' => __( 'Reply' )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), '20100403' );
</span></span></pre>
</div>
</div>
</body>
</html>