From 29e03dd26c67965087e92a5d7a6bd1834a8ff317 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Wed, 30 Nov 2016 23:21:32 +0000 Subject: [PATCH] Docs: Document the usage of the global `$wpdb` in `_filter_query_attachment_filenames()`. Merge of [39390] to the 4.7 branch. Props mt8.biz. See #38973. Built from https://develop.svn.wordpress.org/branches/4.7@39391 git-svn-id: http://core.svn.wordpress.org/branches/4.7@39331 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/post.php | 2 ++ wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 9505227fb5..ab50c27d94 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1160,6 +1160,8 @@ function wp_edit_attachments_query_vars( $q = false ) { * @since 4.7.0 * @access private * + * @global wpdb $wpdb WordPress database abstraction object. + * * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY, * DISTINCT, fields (SELECT), and LIMITS clauses. * @return array The modified clauses. diff --git a/wp-includes/version.php b/wp-includes/version.php index fe0b5010c3..5f67beb906 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-RC1-39389'; +$wp_version = '4.7-RC1-39391'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.