Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused references to global $wpdb

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-20 00:50:29 +00:00
parent 12c913823d
commit 80d9329e5e
6 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/formatting.php
View File

@ -1208,11 +1208,8 @@ function untrailingslashit($string) {
* @return string Returns a string escaped with slashes. * @return string Returns a string escaped with slashes.
*/ */
function addslashes_gpc($gpc) { function addslashes_gpc($gpc) {
global $wpdb; if ( get_magic_quotes_gpc() )
if (get_magic_quotes_gpc()) {
$gpc = stripslashes($gpc); $gpc = stripslashes($gpc);
}
return esc_sql($gpc); return esc_sql($gpc);
} }

3
wp-includes/functions.php
View File

@ -1442,15 +1442,12 @@ function remove_query_arg( $key, $query=false ) {
/** /**
* Walks the array while sanitizing the contents. * Walks the array while sanitizing the contents.
* *
* @uses $wpdb Used to sanitize values
* @since 0.71 * @since 0.71
* *
* @param array $array Array to used to walk while sanitizing contents. * @param array $array Array to used to walk while sanitizing contents.
* @return array Sanitized $array. * @return array Sanitized $array.
*/ */
function add_magic_quotes( $array ) { function add_magic_quotes( $array ) {
global $wpdb;
foreach ( (array) $array as $k => $v ) { foreach ( (array) $array as $k => $v ) {
if ( is_array( $v ) ) { if ( is_array( $v ) ) {
$array[$k] = add_magic_quotes( $v ); $array[$k] = add_magic_quotes( $v );

2
wp-includes/link-template.php
View File

@ -1076,7 +1076,7 @@ function prev_post_rel_link($title = '%title', $in_same_cat = false, $excluded_c
* @return object * @return object
*/ */
function get_boundary_post($in_same_cat = false, $excluded_categories = '', $start = true) { function get_boundary_post($in_same_cat = false, $excluded_categories = '', $start = true) {
global $post, $wpdb; global $post;
if ( empty($post) || !is_single() || is_attachment() ) if ( empty($post) || !is_single() || is_attachment() )
return null; return null;

2
wp-includes/ms-functions.php
View File

@ -1051,8 +1051,6 @@ function get_current_site() {
} }
function get_user_id_from_string( $string ) { function get_user_id_from_string( $string ) {
global $wpdb;
$user_id = 0; $user_id = 0;
if ( is_email( $string ) ) { if ( is_email( $string ) ) {
$user = get_user_by('email', $string); $user = get_user_by('email', $string);

2
wp-includes/post.php
View File

@ -3930,7 +3930,7 @@ function update_postmeta_cache($post_ids) {
* @param bool $clean_terms optional. Whether to clean terms cache * @param bool $clean_terms optional. Whether to clean terms cache
*/ */
function clean_attachment_cache($id, $clean_terms = false) { function clean_attachment_cache($id, $clean_terms = false) {
global $_wp_suspend_cache_invalidation, $wpdb; global $_wp_suspend_cache_invalidation;
if ( !empty($_wp_suspend_cache_invalidation) ) if ( !empty($_wp_suspend_cache_invalidation) )
return; return;

1
wp-includes/rss.php
View File

@ -715,7 +715,6 @@ class RSSCache {
Output: true on sucess Output: true on sucess
\*=======================================================================*/ \*=======================================================================*/
function set ($url, $rss) { function set ($url, $rss) {
global $wpdb;
$cache_option = 'rss_' . $this->file_name( $url ); $cache_option = 'rss_' . $this->file_name( $url );
set_transient($cache_option, $rss, $this->MAX_AGE); set_transient($cache_option, $rss, $this->MAX_AGE);