<!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>[18477] trunk/wp-includes/link-template.php: Support an array or comma-seperated list of excluded category IDs in get_adjacent_post().</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://core.trac.wordpress.org/changeset/18477">18477</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-07-28 17:19:51 +0000 (Thu, 28 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support an array or comma-seperated list of excluded category IDs in get_adjacent_post(). Props solarissmoke. fixes <a href="http://core.trac.wordpress.org/ticket/17673">#17673</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (18476 => 18477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-07-28 17:12:18 UTC (rev 18476)
+++ trunk/wp-includes/link-template.php 2011-07-28 17:19:51 UTC (rev 18477)
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether post should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="cx"> */
</span><span class="cx"> function get_previous_post($in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1078,7 +1078,7 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether post should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="cx"> */
</span><span class="cx"> function get_next_post($in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1093,11 +1093,11 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether post should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @param bool $previous Optional. Whether to retrieve previous post.
</span><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="cx"> */
</span><del>-function get_adjacent_post($in_same_cat = false, $excluded_categories = '', $previous = true) {
</del><ins>+function get_adjacent_post( $in_same_cat = false, $excluded_categories = '', $previous = true ) {
</ins><span class="cx"> global $post, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $post ) )
</span><span class="lines">@@ -1107,7 +1107,7 @@
</span><span class="cx">
</span><span class="cx"> $join = '';
</span><span class="cx"> $posts_in_ex_cats_sql = '';
</span><del>- if ( $in_same_cat || !empty($excluded_categories) ) {
</del><ins>+ if ( $in_same_cat || ! empty( $excluded_categories ) ) {
</ins><span class="cx"> $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
</span><span class="cx">
</span><span class="cx"> if ( $in_same_cat ) {
</span><span class="lines">@@ -1116,9 +1116,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $posts_in_ex_cats_sql = "AND tt.taxonomy = 'category'";
</span><del>- if ( !empty($excluded_categories) ) {
- $excluded_categories = array_map('intval', explode(' and ', $excluded_categories));
- if ( !empty($cat_array) ) {
</del><ins>+ if ( ! empty( $excluded_categories ) ) {
+ if ( ! is_array( $excluded_categories ) ) {
+ // back-compat, $excluded_categories used to be IDs separated by " and "
+ if ( strpos( $excluded_categories, ' and ' ) !== false )
+ $excluded_categories = explode( ' and ', $excluded_categories );
+ else
+ $excluded_categories = explode( ',', $excluded_categories );
+ }
+
+ $excluded_categories = array_map( 'intval', $excluded_categories );
+
+ if ( ! empty( $cat_array ) ) {
</ins><span class="cx"> $excluded_categories = array_diff($excluded_categories, $cat_array);
</span><span class="cx"> $posts_in_ex_cats_sql = '';
</span><span class="cx"> }
</span><span class="lines">@@ -1160,7 +1169,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @param bool $previous Optional, default is true. Whether display link to previous post.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="lines">@@ -1197,7 +1206,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function adjacent_posts_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
</span><span class="lines">@@ -1224,7 +1233,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function next_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', false);
</span><span class="lines">@@ -1237,7 +1246,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function prev_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> echo get_adjacent_post_rel_link($title, $in_same_cat, $excluded_categories = '', true);
</span><span class="lines">@@ -1252,37 +1261,36 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether returned post should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @param bool $start Optional. Whether to retrieve first or last post.
</span><span class="cx"> * @return object
</span><span class="cx"> */
</span><del>-function get_boundary_post($in_same_cat = false, $excluded_categories = '', $start = true) {
</del><ins>+function get_boundary_post( $in_same_cat = false, $excluded_categories = '', $start = true ) {
</ins><span class="cx"> global $post;
</span><span class="cx">
</span><del>- if ( empty($post) || !is_single() || is_attachment() )
</del><ins>+ if ( empty($post) || ! is_single() || is_attachment() )
</ins><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> $cat_array = array();
</span><del>- $excluded_categories = array();
- if ( !empty($in_same_cat) || !empty($excluded_categories) ) {
- if ( !empty($in_same_cat) ) {
- $cat_array = wp_get_object_terms($post->ID, 'category', array('fields' => 'ids'));
- }
</del><ins>+ if( ! is_array( $excluded_categories ) )
+ $excluded_categories = explode( ',', $excluded_categories );
+
+ if ( $in_same_cat || ! empty( $excluded_categories ) ) {
+ if ( $in_same_cat )
+ $cat_array = wp_get_object_terms( $post->ID, 'category', array( 'fields' => 'ids' ) );
</ins><span class="cx">
</span><del>- if ( !empty($excluded_categories) ) {
- $excluded_categories = array_map('intval', explode(',', $excluded_categories));
</del><ins>+ if ( ! empty( $excluded_categories ) ) {
+ $excluded_categories = array_map( 'intval', $excluded_categories );
+ $excluded_categories = array_diff( $excluded_categories, $cat_array );
</ins><span class="cx">
</span><del>- if ( !empty($cat_array) )
- $excluded_categories = array_diff($excluded_categories, $cat_array);
-
</del><span class="cx"> $inverse_cats = array();
</span><del>- foreach ( $excluded_categories as $excluded_category)
</del><ins>+ foreach ( $excluded_categories as $excluded_category )
</ins><span class="cx"> $inverse_cats[] = $excluded_category * -1;
</span><span class="cx"> $excluded_categories = $inverse_cats;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $categories = implode(',', array_merge($cat_array, $excluded_categories) );
</del><ins>+ $categories = implode( ',', array_merge( $cat_array, $excluded_categories ) );
</ins><span class="cx">
</span><span class="cx"> $order = $start ? 'ASC' : 'DESC';
</span><span class="cx">
</span><span class="lines">@@ -1298,7 +1306,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @param bool $start Optional, default is true. Whether display link to first or last post.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="lines">@@ -1335,7 +1343,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
</span><span class="lines">@@ -1407,7 +1415,7 @@
</span><span class="cx"> * @param string $format Optional. Link anchor format.
</span><span class="cx"> * @param string $link Optional. Link permalink format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function previous_post_link($format='&laquo; %link', $link='%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> adjacent_post_link($format, $link, $in_same_cat, $excluded_categories, true);
</span><span class="lines">@@ -1421,7 +1429,7 @@
</span><span class="cx"> * @param string $format Optional. Link anchor format.
</span><span class="cx"> * @param string $link Optional. Link permalink format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> */
</span><span class="cx"> function next_post_link($format='%link &raquo;', $link='%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="cx"> adjacent_post_link($format, $link, $in_same_cat, $excluded_categories, false);
</span><span class="lines">@@ -1437,7 +1445,7 @@
</span><span class="cx"> * @param string $format Link anchor format.
</span><span class="cx"> * @param string $link Link permalink format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><del>- * @param string $excluded_categories Optional. Excluded categories IDs.
</del><ins>+ * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</ins><span class="cx"> * @param bool $previous Optional, default is true. Whether display link to previous post.
</span><span class="cx"> */
</span><span class="cx"> function adjacent_post_link($format, $link, $in_same_cat = false, $excluded_categories = '', $previous = true) {
</span></span></pre>
</div>
</div>
</body>
</html>