Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-30 16:17:56 +02:00
Code Issues Projects Releases Wiki Activity

Rename unused argument and remove obsolete global in iframe_header().

Browse Source 
props ipm-frommen.
fixes #31309.
Built from https://develop.svn.wordpress.org/trunk@31443


git-svn-id: http://core.svn.wordpress.org/trunk@31424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-13 05:31:26 +00:00
parent 268d79cb77
commit 5a0b01edf1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/template.php
View File

@ -250,7 +250,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
* @since 2.5.0 * @since 2.5.0
* *
* @param string $taxonomy Taxonomy to retrieve terms from. * @param string $taxonomy Taxonomy to retrieve terms from.
* @param int $default Unused. * @param int $default Not used.
* @param int $number Number of terms to retrieve. Defaults to 10. * @param int $number Number of terms to retrieve. Defaults to 10.
* @param bool $echo Optionally output the list as well. Defaults to true. * @param bool $echo Optionally output the list as well. Defaults to true.
* @return array List of popular term IDs. * @return array List of popular term IDs.
@ -1527,12 +1527,12 @@ function _admin_search_query() {
* *
* @since 2.7.0 * @since 2.7.0
* @param string $title Title of the Iframe page. * @param string $title Title of the Iframe page.
* @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued). * @param bool $deprecated Not used.
* *
*/ */
function iframe_header( $title = '', $limit_styles = false ) { function iframe_header( $title = '', $deprecated = false ) {
show_admin_bar( false ); show_admin_bar( false );
global $hook_suffix, $current_user, $admin_body_class, $wp_locale; global $hook_suffix, $admin_body_class, $wp_locale;
$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix); $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
$current_screen = get_current_screen(); $current_screen = get_current_screen();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31442'; $wp_version = '4.2-alpha-31443';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.