From 55fdfb529a2f206cc13fb1458501532ecd9f0f5f Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 8 Jan 2015 06:10:46 +0000 Subject: [PATCH] There is no need to use the `final` modifier inside a `final` class. Everything in it is `final` by default. See #30799. Built from https://develop.svn.wordpress.org/trunk@31085 git-svn-id: http://core.svn.wordpress.org/trunk@31066 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-customize-manager.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 0684e33cb7..c9dc52d447 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -894,7 +894,7 @@ final class WP_Customize_Manager { * @param {WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control} $b Object B. * @return int */ - protected final function _cmp_priority( $a, $b ) { + protected function _cmp_priority( $a, $b ) { if ( $a->priority === $b->priority ) { return $a->instance_number - $a->instance_number; } else { diff --git a/wp-includes/version.php b/wp-includes/version.php index c1c33a4286..73eaee97be 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31083'; +$wp_version = '4.2-alpha-31085'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.