<!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>[16771] trunk/wp-admin/admin-ajax.php:
Use assign_terms cap for tag search and tag cloud in admin ajax.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16771">16771</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-07 18:59:25 +0000 (Tue, 07 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use assign_terms cap for tag search and tag cloud in admin ajax. fixes <a href="http://trac.wordpress.org/ticket/15437">#15437</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.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 (16770 => 16771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-12-07 18:55:13 UTC (rev 16770)
+++ trunk/wp-admin/admin-ajax.php 2010-12-07 18:59:25 UTC (rev 16771)
</span><span class="lines">@@ -66,16 +66,19 @@
</span><span class="cx"> die( '0' );
</span><span class="cx"> break;
</span><span class="cx"> case 'ajax-tag-search' :
</span><del>- if ( !current_user_can( 'edit_posts' ) )
- die('-1');
</del><ins>+ if ( isset( $_GET['tax'] ) ) {
+ $taxonomy = sanitize_key( $_GET['tax'] );
+ $tax = get_taxonomy( $taxonomy );
+ if ( ! $tax )
+ die( '0' );
+ if ( ! current_user_can( $tax->cap->assign_terms ) )
+ die( '-1' );
+ } else {
+ die('0');
+ }
</ins><span class="cx">
</span><span class="cx"> $s = $_GET['q']; // is this slashed already?
</span><span class="cx">
</span><del>- if ( isset($_GET['tax']) )
- $taxonomy = sanitize_title($_GET['tax']);
- else
- die('0');
-
</del><span class="cx"> if ( false !== strpos( $s, ',' ) ) {
</span><span class="cx"> $s = explode( ',', $s );
</span><span class="cx"> $s = $s[count( $s ) - 1];
</span><span class="lines">@@ -547,23 +550,24 @@
</span><span class="cx"> $x->send();
</span><span class="cx"> break;
</span><span class="cx"> case 'get-tagcloud' :
</span><del>- if ( !current_user_can( 'edit_posts' ) )
- die('-1');
-
- if ( isset($_POST['tax']) )
- $taxonomy = sanitize_title($_POST['tax']);
- else
</del><ins>+ if ( isset( $_POST['tax'] ) ) {
+ $taxonomy = sanitize_key( $_POST['tax'] );
+ $tax = get_taxonomy( $taxonomy );
+ if ( ! $tax )
+ die( '0' );
+ if ( ! current_user_can( $tax->cap->assign_terms ) )
+ die( '-1' );
+ } else {
</ins><span class="cx"> die('0');
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
</span><span class="cx">
</span><del>- if ( empty( $tags ) ) {
- $tax = get_taxonomy( $taxonomy );
</del><ins>+ if ( empty( $tags ) )
</ins><span class="cx"> die( isset( $tax->no_tagcloud ) ? $tax->no_tagcloud : __('No tags found!') );
</span><del>- }
</del><span class="cx">
</span><del>- if ( is_wp_error($tags) )
- die($tags->get_error_message());
</del><ins>+ if ( is_wp_error( $tags ) )
+ die( $tags->get_error_message() );
</ins><span class="cx">
</span><span class="cx"> foreach ( $tags as $key => $tag ) {
</span><span class="cx"> $tags[ $key ]->link = '#';
</span></span></pre>
</div>
</div>
</body>
</html>