<!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>[15451] branches/3.0/wp-admin:
Make posts per page filters consistent and back compat.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15451">15451</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-07-21 17:27:37 +0000 (Wed, 21 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make posts per page filters consistent and back compat. Props wpmuguru. fixes <a href="http://trac.wordpress.org/ticket/14135">#14135</a> for 3.0.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpadmineditphp">branches/3.0/wp-admin/edit.php</a></li>
<li><a href="#branches30wpadminincludespostphp">branches/3.0/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpadmineditphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-admin/edit.php (15450 => 15451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-admin/edit.php 2010-07-21 17:27:04 UTC (rev 15450)
+++ branches/3.0/wp-admin/edit.php 2010-07-21 17:27:37 UTC (rev 15451)
</span><span class="lines">@@ -43,13 +43,14 @@
</span><span class="cx"> $pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
</span><span class="cx"> if ( empty($pagenum) )
</span><span class="cx"> $pagenum = 1;
</span><del>-$per_page = 'edit_' . $post_type . '_per_page';
-$per_page = (int) get_user_option( $per_page );
</del><ins>+$edit_per_page = 'edit_' . $post_type . '_per_page';
+$per_page = (int) get_user_option( $edit_per_page );
</ins><span class="cx"> if ( empty( $per_page ) || $per_page < 1 )
</span><span class="cx"> $per_page = 20;
</span><del>-// @todo filter based on type
-$per_page = apply_filters( 'edit_posts_per_page', $per_page );
</del><span class="cx">
</span><ins>+$per_page = apply_filters( $edit_per_page, $per_page );
+$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+
</ins><span class="cx"> // Handle bulk actions
</span><span class="cx"> if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
</span><span class="cx"> check_admin_referer('bulk-posts');
</span></span></pre></div>
<a id="branches30wpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-admin/includes/post.php (15450 => 15451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-admin/includes/post.php 2010-07-21 17:27:04 UTC (rev 15450)
+++ branches/3.0/wp-admin/includes/post.php 2010-07-21 17:27:37 UTC (rev 15451)
</span><span class="lines">@@ -895,9 +895,10 @@
</span><span class="cx"> $posts_per_page = (int) get_user_option( $per_page );
</span><span class="cx"> if ( empty( $posts_per_page ) || $posts_per_page < 1 )
</span><span class="cx"> $posts_per_page = 20;
</span><ins>+
</ins><span class="cx"> $posts_per_page = apply_filters( $per_page, $posts_per_page );
</span><ins>+ $posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
</ins><span class="cx">
</span><del>-
</del><span class="cx"> $query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
</span><span class="cx">
</span><span class="cx"> // Hierarchical types require special args.
</span></span></pre>
</div>
</div>
</body>
</html>