<!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>[13240] trunk/wp-includes: Remove unused references to global $wpdb</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13240">13240</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-20 00:50:29 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused references to global $wpdb</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesrssphp">trunk/wp-includes/rss.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/formatting.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -1208,11 +1208,8 @@
</span><span class="cx"> * @return string Returns a string escaped with slashes.
</span><span class="cx"> */
</span><span class="cx"> function addslashes_gpc($gpc) {
</span><del>- global $wpdb;
-
- if (get_magic_quotes_gpc()) {
</del><ins>+ if ( get_magic_quotes_gpc() )
</ins><span class="cx"> $gpc = stripslashes($gpc);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return esc_sql($gpc);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/functions.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -1442,15 +1442,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Walks the array while sanitizing the contents.
</span><span class="cx"> *
</span><del>- * @uses $wpdb Used to sanitize values
</del><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="cx"> * @param array $array Array to used to walk while sanitizing contents.
</span><span class="cx"> * @return array Sanitized $array.
</span><span class="cx"> */
</span><span class="cx"> function add_magic_quotes( $array ) {
</span><del>- global $wpdb;
-
</del><span class="cx"> foreach ( (array) $array as $k => $v ) {
</span><span class="cx"> if ( is_array( $v ) ) {
</span><span class="cx"> $array[$k] = add_magic_quotes( $v );
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/link-template.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -1076,7 +1076,7 @@
</span><span class="cx"> * @return object
</span><span class="cx"> */
</span><span class="cx"> function get_boundary_post($in_same_cat = false, $excluded_categories = '', $start = true) {
</span><del>- global $post, $wpdb;
</del><ins>+ global $post;
</ins><span class="cx">
</span><span class="cx"> if ( empty($post) || !is_single() || is_attachment() )
</span><span class="cx"> return null;
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/ms-functions.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -1051,8 +1051,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_user_id_from_string( $string ) {
</span><del>- global $wpdb;
-
</del><span class="cx"> $user_id = 0;
</span><span class="cx"> if ( is_email( $string ) ) {
</span><span class="cx"> $user = get_user_by('email', $string);
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/post.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -3930,7 +3930,7 @@
</span><span class="cx"> * @param bool $clean_terms optional. Whether to clean terms cache
</span><span class="cx"> */
</span><span class="cx"> function clean_attachment_cache($id, $clean_terms = false) {
</span><del>- global $_wp_suspend_cache_invalidation, $wpdb;
</del><ins>+ global $_wp_suspend_cache_invalidation;
</ins><span class="cx">
</span><span class="cx"> if ( !empty($_wp_suspend_cache_invalidation) )
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rss.php (13239 => 13240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rss.php 2010-02-20 00:02:59 UTC (rev 13239)
+++ trunk/wp-includes/rss.php 2010-02-20 00:50:29 UTC (rev 13240)
</span><span class="lines">@@ -715,7 +715,6 @@
</span><span class="cx"> Output: true on sucess
</span><span class="cx"> \*=======================================================================*/
</span><span class="cx"> function set ($url, $rss) {
</span><del>- global $wpdb;
</del><span class="cx"> $cache_option = 'rss_' . $this->file_name( $url );
</span><span class="cx">
</span><span class="cx"> set_transient($cache_option, $rss, $this->MAX_AGE);
</span></span></pre>
</div>
</div>
</body>
</html>