<!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>[12409] trunk: Remove no longer needed DB has_cap() checks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12409">12409</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-15 21:01:57 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove no longer needed DB has_cap() checks. Props filosofo. fixes <a href="http://trac.wordpress.org/ticket/11443">#11443</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12408 => 12409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2009-12-15 19:57:20 UTC (rev 12408)
+++ trunk/wp-admin/includes/schema.php 2009-12-15 21:01:57 UTC (rev 12409)
</span><span class="lines">@@ -19,12 +19,10 @@
</span><span class="cx"> // Declare these as global in case schema.php is included from a function.
</span><span class="cx"> global $wpdb, $wp_queries;
</span><span class="cx">
</span><del>-if ( $wpdb->has_cap( 'collation' ) ) {
- if ( ! empty($wpdb->charset) )
- $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
- if ( ! empty($wpdb->collate) )
- $charset_collate .= " COLLATE $wpdb->collate";
-}
</del><ins>+if ( ! empty($wpdb->charset) )
+ $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+if ( ! empty($wpdb->collate) )
+ $charset_collate .= " COLLATE $wpdb->collate";
</ins><span class="cx">
</span><span class="cx"> /** Create WordPress database tables SQL */
</span><span class="cx"> $wp_queries = "CREATE TABLE $wpdb->terms (
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (12408 => 12409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2009-12-15 19:57:20 UTC (rev 12408)
+++ trunk/wp-includes/query.php 2009-12-15 21:01:57 UTC (rev 12409)
</span><span class="lines">@@ -1784,14 +1784,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['category__not_in']) ) {
</span><del>- if ( $wpdb->has_cap( 'subqueries' ) ) {
- $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
- $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
- } else {
- $ids = get_objects_in_term($q['category__not_in'], 'category');
- if ( !is_wp_error($ids) && is_array($ids) && count($ids) > 0 )
- $whichcat .= " AND $wpdb->posts.ID NOT IN ('" . implode("', '", $ids) . "')";
- }
</del><ins>+ $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
+ $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'category' AND tt.term_id IN ($cat_string) )";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Category stuff for nice URLs
</span><span class="lines">@@ -1874,14 +1868,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($q['tag__not_in']) ) {
</span><del>- if ( $wpdb->has_cap( 'subqueries' ) ) {
- $tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
- $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
- } else {
- $ids = get_objects_in_term($q['tag__not_in'], 'post_tag');
- if ( !is_wp_error($ids) && is_array($ids) && count($ids) > 0 )
- $whichcat .= " AND $wpdb->posts.ID NOT IN ('" . implode("', '", $ids) . "')";
- }
</del><ins>+ $tag_string = "'" . implode("', '", $q['tag__not_in']) . "'";
+ $whichcat .= " AND $wpdb->posts.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy = 'post_tag' AND tt.term_id IN ($tag_string) )";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Tag and slug intersections.
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (12408 => 12409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2009-12-15 19:57:20 UTC (rev 12408)
+++ trunk/wp-includes/wp-db.php 2009-12-15 21:01:57 UTC (rev 12409)
</span><span class="lines">@@ -385,17 +385,15 @@
</span><span class="cx">
</span><span class="cx"> $this->ready = true;
</span><span class="cx">
</span><del>- if ( $this->has_cap( 'collation' ) ) {
- if ( !empty($this->charset) ) {
- if ( function_exists('mysql_set_charset') ) {
- mysql_set_charset($this->charset, $this->dbh);
- $this->real_escape = true;
- } else {
- $collation_query = "SET NAMES '{$this->charset}'";
- if ( !empty($this->collate) )
- $collation_query .= " COLLATE '{$this->collate}'";
- $this->query($collation_query);
- }
</del><ins>+ if ( !empty($this->charset) ) {
+ if ( function_exists('mysql_set_charset') ) {
+ mysql_set_charset($this->charset, $this->dbh);
+ $this->real_escape = true;
+ } else {
+ $collation_query = "SET NAMES '{$this->charset}'";
+ if ( !empty($this->collate) )
+ $collation_query .= " COLLATE '{$this->collate}'";
+ $this->query($collation_query);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>