<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17321] trunk: Revert [17270], [17273], see #16166, see #16262.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17321">17321</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-01-16 21:34:38 +0000 (Sun, 16 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/17270">[17270]</a>, <a href="http://trac.wordpress.org/changeset/17273">[17273]</a>, see <a href="http://trac.wordpress.org/ticket/16166">#16166</a>, see <a href="http://trac.wordpress.org/ticket/16262">#16262</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminjslisttabledevjs">trunk/wp-admin/js/list-table.dev.js</a></li>
<li><a href="#trunkwpadminjslisttablejs">trunk/wp-admin/js/list-table.js</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/edit-comments.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
</span><span class="cx">
</span><span class="cx"> $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
</span><del>- $redirect_to = $wp_list_table->add_query_args( $redirect_to );
</del><ins>+ $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
</ins><span class="cx">
</span><span class="cx"> foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
</span><span class="cx"> if ( !current_user_can( 'edit_comment', $comment_id ) )
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/edit-tags.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -78,7 +78,6 @@
</span><span class="cx">
</span><span class="cx"> wp_delete_term( $tag_ID, $taxonomy );
</span><span class="cx">
</span><del>- $location = $wp_list_table->add_query_args( $location );
</del><span class="cx"> $location = add_query_arg( 'message', 2, $location );
</span><span class="cx"> wp_redirect( $location );
</span><span class="cx"> exit;
</span><span class="lines">@@ -105,7 +104,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $location = add_query_arg( 'message', 6, $location );
</span><del>- $location = $wp_list_table->add_query_args( $location );
</del><span class="cx"> wp_redirect( $location );
</span><span class="cx"> exit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/edit.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> check_admin_referer('bulk-posts');
</span><span class="cx">
</span><span class="cx"> $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
</span><del>- $sendback = $wp_list_table->add_query_args( $sendback );
</del><ins>+ $sendback = add_query_arg( 'paged', $pagenum, $sendback );
</ins><span class="cx"> if ( strpos($sendback, 'post.php') !== false )
</span><span class="cx"> $sendback = admin_url($post_new_file);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -618,30 +618,7 @@
</span><span class="cx"> $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
</span><span class="cx"> return count( $columns ) - count( $hidden );
</span><span class="cx"> }
</span><del>-
- function get_order_info() {
- $current_orderby = isset( $_GET['orderby'] ) ? $_GET['orderby'] : '';
</del><span class="cx">
</span><del>- if ( ! $current_orderby )
- $current_order = '';
- elseif ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
- $current_order = 'desc';
- else
- $current_order = 'asc';
-
- return array( $current_orderby, $current_order );
- }
-
- function add_query_args( $location ) {
- $pagenum = $this->get_pagenum();
- list( $current_orderby, $current_order ) = $this->get_order_info();
- $location = add_query_arg( 'paged', $pagenum, $location );
- if ( $current_orderby )
- $location = add_query_arg( array( 'orderby' => $current_orderby, 'order' => $current_order ), $location );
-
- return $location;
- }
-
</del><span class="cx"> /**
</span><span class="cx"> * Print column headers, accounting for hidden and sortable columns.
</span><span class="cx"> *
</span><span class="lines">@@ -657,8 +634,16 @@
</span><span class="cx">
</span><span class="cx"> $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
</span><span class="cx">
</span><del>- list( $current_orderby, $current_order ) = $this->get_order_info();
</del><ins>+ if ( isset( $_GET['orderby'] ) )
+ $current_orderby = $_GET['orderby'];
+ else
+ $current_orderby = '';
</ins><span class="cx">
</span><ins>+ if ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+ $current_order = 'desc';
+ else
+ $current_order = 'asc';
+
</ins><span class="cx"> foreach ( $columns as $column_key => $column_display_name ) {
</span><span class="cx"> $class = array( 'manage-column', "column-$column_key" );
</span><span class="cx">
</span><span class="lines">@@ -752,11 +737,8 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> */
</span><span class="cx"> function display_tablenav( $which ) {
</span><del>- if ( 'top' == $which ) {
</del><ins>+ if ( 'top' == $which )
</ins><span class="cx"> wp_nonce_field( 'bulk-' . $this->_args['plural'] );
</span><del>- list( $current_orderby, $current_order ) = $this->get_order_info();
- echo '<input type="hidden" name="orderby" value="' . esc_attr( $current_orderby ) . '" /><input type="hidden" name="order" value="' . esc_attr( $current_order ) . '" />';
- }
</del><span class="cx"> ?>
</span><span class="cx"> <div class="tablenav <?php echo esc_attr( $which ); ?>">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.dev.js (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.dev.js 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/js/list-table.dev.js 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -122,9 +122,7 @@
</span><span class="cx"> if ( 'object' != typeof response ) {
</span><span class="cx"> this.handle_error();
</span><span class="cx"> } else {
</span><del>- var tablenav = $('.tablenav-pages'),
- order = $.query.GET('order'),
- orderby = order ? $.query.GET('orderby') : '';
</del><ins>+ var tablenav = $('.tablenav-pages');
</ins><span class="cx">
</span><span class="cx"> this.stop_loading();
</span><span class="cx">
</span><span class="lines">@@ -146,9 +144,6 @@
</span><span class="cx"> tablenav.find('.first-page, .prev-page').toggleClass('disabled', 1 == $.query.GET('paged'));
</span><span class="cx"> tablenav.find('.next-page, .last-page').toggleClass('disabled', response.total_pages == $.query.GET('paged'));
</span><span class="cx">
</span><del>- $('input[name=order]').val(order);
- $('input[name=orderby]').val(orderby);
-
</del><span class="cx"> $('th.column-cb :input').attr('checked', false);
</span><span class="cx">
</span><span class="cx"> if ( history.replaceState ) {
</span></span></pre></div>
<a id="trunkwpadminjslisttablejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/list-table.js (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/list-table.js 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/js/list-table.js 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(document).ready(function(a){window.listTable={init:function(){this.loading=false;this.reset(".tablenav, .search-box, .wp-list-table");if(""==a.query.GET("paged")){a.query.SET("paged",1)}this.set_total_pages();this.$tbody=a("#the-list, #the-comment-list")},reset:function(d){d=a(d);a("input",d).each(function(){this.value=this.defaultValue;this.checked=this.defaultChecked});a("select",d).each(function(){var e=a("option",this),f=false;e.each(function(){this.selected=this.defaultSelected;f=f||this.defaultSelected});if(!this.multiple&&!f){e[0].selected=true}});a("textarea",d).each(function(){this.value=this.defaultValue})},set_total_pages:function(e){var d=a(".last-page").attr("href");if(d){this.total_pages=e||a.query.load(d).get("paged")}},get_total_pages:function(){return this.total_pages},htmlencode:function(d){return a("<div/>").text(d).html()},update_rows:function(e,d,h){if(this.loading){return false}var g=false,f={};a.each(e,function(i,j){if(j!=a.query.GET(i)){a.query.SET(i,j);g=true}});if(!g){return false}this.start_loading();if(d){a.query.SET("paged",1)}a.each(a.query.get(),function(i,j){if(true===j){f[i]=""}else{f[i]=j}});this._callback=h;this.fetch_list(f,a.proxy(this,"handle_success"),a.proxy(this,"handle_error"));return true},fetch_list:function(e,f,d){e=a.extend(e,{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:e,success:f,error:d})},handle_success:function(e){if("object"!=typeof e){this.handle_error()}else{var f=a(".tablenav-pages"),d=a.query.GET("order"),g=d?a.query.GET("orderby"):"";this.stop_loading();a("div.updated, div.error").not(".persistent, .inline").remove();this.$tbody.html(e.rows);a(".displaying-num").html(e.total_items_i18n);a(".total-pages").html(e.total_pages_i18n);this.set_total_pages(e.total_pages);if(e.total_pages>1){f.removeClass("one-page")}a(".current-page").val(a.query.GET("paged"));f.find(".first-page, .prev-page").toggleClass("disabled",1==a.query.GET("paged"));f.find(".next-page, .last-page").toggleClass("disabled",e.total_pages==a.query.GET("paged"));a("input[name=order]").val(d);a("input[name=orderby]").val(g);a("th.column-cb :input").attr("checked",false);if(history.replaceState){history.replaceState({},"",location.pathname+a.query)}if(this._callback){this._callback()}}},handle_error:function(){this.stop_loading();a("h2").after('<div class="error ajax below-h2"><p>'+listTableL10n.error+"</p></div>")},start_loading:function(){this.loading=true;a(".error.ajax").remove();a(".list-ajax-loading").css("visibility","visible")},stop_loading:function(){this.loading=false;a(".list-ajax-loading").css("visibility","hidden")}};listTable.init();function b(e,d){if(e<1){e=1}if(e>listTable.get_total_pages()){e=listTable.get_total_pages()}a(listTable).trigger("beforeChangePage");listTable.update_rows({paged:e},false,function(){if(d.parents(".tablenav.bottom").length){scrollTo(0,0)}a(listTable).trigger("changePage")})}a(".tablenav-pages a").click(function(){var e=a(this),d=a.query.GET("paged");switch(e.attr("class")){case"first-page":d=1;break;case"prev-page":d-=1;break;case"next-page":d+=1;break;case"last-page":d=listTable.get_total_pages();break}b(d,e);return false});a(".current-page").keypress(function(f){if(13!=f.keyCode){return}var d=a(this);b(parseInt(d.val())||1,d);return false});a("th.sortable a, th.sorted a").click(function(){function i(k){return a.query.load(k.find("a").attr("href")).get("order")}var f=a(this),h=f.parent("th"),g=h.index(),j=a.query.load(f.attr("href")).get("orderby"),e;h=h.closest("table").find("thead th:eq("+g+"), tfoot th:eq("+g+")");if(j==a.query.get("orderby")){e=("asc"==a.query.get("order"))?"desc":"asc"}else{e=i(h);var d=a("th.sorted");if(d.length){d.removeClass("sorted").addClass("sortable");d.removeClass("desc").removeClass("asc").addClass("asc"==i(d)?"desc":"asc")}h.removeClass("sortable").addClass("sorted")}h.removeClass("desc").removeClass("asc").addClass(e);listTable.update_rows({orderby:j,order:e},true);return false});function c(d){if("keypress"==d.type&&13!=d.keyCode){return}d.preventDefault();d.stopImmediatePropagation();var e=a(this).parent(".search-box").find(":input").serializeObject();listTable.update_rows(e,true,function(){if(a("h2.nav-tab-wrapper").length){return}if("site-users-network"==pagenow||"site-themes-network"==pagenow){a("h4.search-text").remove();if(e.s){a("ul.subsubsub").after(a('<h4 class="clear search-text">').html(listTableL10n.search.replace("%s",this.htmlencode(e.s))))}}else{a("h2 .subtitle").remove();if(e.s){a("h2").append(a('<span class="subtitle">').html(listTableL10n.search.replace("%s",this.htmlencode(e.s))))}}})}a(".search-box :submit").click(c);a(".search-box :text").keypress(c);a("#post-query-submit").click(function(){var d={};a(this).parents(".actions").find('select[name!="action"]').each(function(){var e=a(this);d[e.attr("name")]=e.val()});listTable.update_rows(d,true);return false});a(".view-switch a").click(function(){var d=a(this);listTable.update_rows({mode:a.query.load(d.attr("href")).get("mode")},false,function(){a(".view-switch .current").removeClass("current");d.addClass("current")});return false})});
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(document).ready(function(a){window.listTable={init:function(){this.loading=false;this.reset(".tablenav, .search-box, .wp-list-table");if(""==a.query.GET("paged")){a.query.SET("paged",1)}this.set_total_pages();this.$tbody=a("#the-list, #the-comment-list")},reset:function(d){d=a(d);a("input",d).each(function(){this.value=this.defaultValue;this.checked=this.defaultChecked});a("select",d).each(function(){var e=a("option",this),f=false;e.each(function(){this.selected=this.defaultSelected;f=f||this.defaultSelected});if(!this.multiple&&!f){e[0].selected=true}});a("textarea",d).each(function(){this.value=this.defaultValue})},set_total_pages:function(e){var d=a(".last-page").attr("href");if(d){this.total_pages=e||a.query.load(d).get("paged")}},get_total_pages:function(){return this.total_pages},htmlencode:function(d){return a("<div/>").text(d).html()},update_rows:function(e,d,h){if(this.loading){return false}var g=false,f={};a.each(e,function(i,j){if(j!=a.query.GET(i)){a.query.SET(i,j);g=true}});if(!g){return false}this.start_loading();if(d){a.query.SET("paged",1)}a.each(a.query.get(),function(i,j){if(true===j){f[i]=""}else{f[i]=j}});this._callback=h;this.fetch_list(f,a.proxy(this,"handle_success"),a.proxy(this,"handle_error"));return true},fetch_list:function(e,f,d){e=a.extend(e,{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:e,success:f,error:d})},handle_success:function(d){if("object"!=typeof d){this.handle_error()}else{var e=a(".tablenav-pages");this.stop_loading();a("div.updated, div.error").not(".persistent, .inline").remove();this.$tbody.html(d.rows);a(".displaying-num").html(d.total_items_i18n);a(".total-pages").html(d.total_pages_i18n);this.set_total_pages(d.total_pages);if(d.total_pages>1){e.removeClass("one-page")}a(".current-page").val(a.query.GET("paged"));e.find(".first-page, .prev-page").toggleClass("disabled",1==a.query.GET("paged"));e.find(".next-page, .last-page").toggleClass("disabled",d.total_pages==a.query.GET("paged"));a("th.column-cb :input").attr("checked",false);if(history.replaceState){history.replaceState({},"",location.pathname+a.query)}if(this._callback){this._callback()}}},handle_error:function(){this.stop_loading();a("h2").after('<div class="error ajax below-h2"><p>'+listTableL10n.error+"</p></div>")},start_loading:function(){this.loading=true;a(".error.ajax").remove();a(".list-ajax-loading").css("visibility","visible")},stop_loading:function(){this.loading=false;a(".list-ajax-loading").css("visibility","hidden")}};listTable.init();function b(e,d){if(e<1){e=1}if(e>listTable.get_total_pages()){e=listTable.get_total_pages()}a(listTable).trigger("beforeChangePage");listTable.update_rows({paged:e},false,function(){if(d.parents(".tablenav.bottom").length){scrollTo(0,0)}a(listTable).trigger("changePage")})}a(".tablenav-pages a").click(function(){var e=a(this),d=a.query.GET("paged");switch(e.attr("class")){case"first-page":d=1;break;case"prev-page":d-=1;break;case"next-page":d+=1;break;case"last-page":d=listTable.get_total_pages();break}b(d,e);return false});a(".current-page").keypress(function(f){if(13!=f.keyCode){return}var d=a(this);b(parseInt(d.val())||1,d);return false});a("th.sortable a, th.sorted a").click(function(){function i(k){return a.query.load(k.find("a").attr("href")).get("order")}var f=a(this),h=f.parent("th"),g=h.index(),j=a.query.load(f.attr("href")).get("orderby"),e;h=h.closest("table").find("thead th:eq("+g+"), tfoot th:eq("+g+")");if(j==a.query.get("orderby")){e=("asc"==a.query.get("order"))?"desc":"asc"}else{e=i(h);var d=a("th.sorted");if(d.length){d.removeClass("sorted").addClass("sortable");d.removeClass("desc").removeClass("asc").addClass("asc"==i(d)?"desc":"asc")}h.removeClass("sortable").addClass("sorted")}h.removeClass("desc").removeClass("asc").addClass(e);listTable.update_rows({orderby:j,order:e},true);return false});function c(d){if("keypress"==d.type&&13!=d.keyCode){return}d.preventDefault();d.stopImmediatePropagation();var e=a(this).parent(".search-box").find(":input").serializeObject();listTable.update_rows(e,true,function(){if(a("h2.nav-tab-wrapper").length){return}if("site-users-network"==pagenow||"site-themes-network"==pagenow){a("h4.search-text").remove();if(e.s){a("ul.subsubsub").after(a('<h4 class="clear search-text">').html(listTableL10n.search.replace("%s",this.htmlencode(e.s))))}}else{a("h2 .subtitle").remove();if(e.s){a("h2").append(a('<span class="subtitle">').html(listTableL10n.search.replace("%s",this.htmlencode(e.s))))}}})}a(".search-box :submit").click(c);a(".search-box :text").keypress(c);a("#post-query-submit").click(function(){var d={};a(this).parents(".actions").find('select[name!="action"]').each(function(){var e=a(this);d[e.attr("name")]=e.val()});listTable.update_rows(d,true);return false});a(".view-switch a").click(function(){var d=a(this);listTable.update_rows({mode:a.query.load(d.attr("href")).get("mode")},false,function(){a(".view-switch .current").removeClass("current");d.addClass("current")});return false})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-admin/upload.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> $location = $referer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $location = $wp_list_table->add_query_args( $location );
</del><span class="cx"> $location = add_query_arg( array( 'attached' => $attached ) , $location );
</span><span class="cx"> wp_redirect( $location );
</span><span class="cx"> exit;
</span><span class="lines">@@ -122,7 +121,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $location = $wp_list_table->add_query_args( $location );
</del><span class="cx"> wp_redirect( $location );
</span><span class="cx"> exit;
</span><span class="cx"> } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (17320 => 17321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-01-16 05:58:07 UTC (rev 17320)
+++ trunk/wp-includes/script-loader.php 2011-01-16 21:34:38 UTC (rev 17321)
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
</span><span class="cx"> $scripts->add_data( 'admin-custom-fields', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'list-table', "/wp-admin/js/list-table$suffix.js", array( 'jquery-query', 'jquery-serialize-object' ), '20110112' );
</del><ins>+ $scripts->add( 'list-table', "/wp-admin/js/list-table$suffix.js", array( 'jquery-query', 'jquery-serialize-object' ), '20110111a' );
</ins><span class="cx"> $scripts->add_data( 'list-table', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'list-table', 'listTableL10n', array(
</span><span class="cx"> 'error' => __('An error has occurred while loading the items.'),
</span></span></pre>
</div>
</div>
</body>
</html>