WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Overriding methods should do more than simply call the same method in the super class. 

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31101


git-svn-id: http://core.svn.wordpress.org/trunk@31082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-08 21:20:22 +00:00
parent 4a1ad9acec
commit e4b6265c7a
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/includes/class-wp-media-list-table.php
View File

@ -149,13 +149,6 @@ class WP_Media_List_Table extends WP_List_Table {
_e( 'No media attachments found.' );
}
/**
* @param string $which
*/
protected function pagination( $which ) {
parent::pagination( $which );
}
/**
* Override parent views so we can use the filter bar display.
*/

8
wp-admin/includes/class-wp-upgrader-skins.php
View File

@ -317,10 +317,6 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
public $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
public function __construct($args = array()) {
parent::__construct($args);
}
public function add_strings() {
parent::add_strings();
$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)');
@ -361,10 +357,6 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
public $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
public function __construct($args = array()) {
parent::__construct($args);
}
public function add_strings() {
parent::add_strings();
$this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)');

4
wp-includes/class-wp-customize-control.php
View File

@ -934,10 +934,6 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
}
public function to_json() {
parent::to_json();
}
public function enqueue() {
wp_enqueue_media();
wp_enqueue_script( 'customize-views' );

2
wp-includes/version.php
View File

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