Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 22:58:40 +02:00
Code Issues Projects Releases Wiki Activity

Widgets: Make WP_Widget a real abstract class.

Browse Source 
This removes the `die()` call from `WP_Widget::widget()` and converts it to an abstract method.
`WP_Widgets` (later renamed to `WP_Widget`) was introduced in [10764] where the minimum PHP requirement was 4.3, thus no `abstract` was available.

Props johnbillion.
Fixes #35981.
Built from https://develop.svn.wordpress.org/trunk@37425


git-svn-id: http://core.svn.wordpress.org/trunk@37391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-05-12 20:23:28 +00:00
parent 7f1abd441f
commit 97fc82a879
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-widget.php
View File

@ -16,8 +16,9 @@
* *
* @since 2.8.0 * @since 2.8.0
* @since 4.4.0 Moved to its own file from wp-includes/widgets.php * @since 4.4.0 Moved to its own file from wp-includes/widgets.php
* @abstract
*/ */
class WP_Widget { abstract class WP_Widget {
/** /**
* Root ID for all widgets of this type. * Root ID for all widgets of this type.
@ -96,14 +97,13 @@ class WP_Widget {
* *
* @since 2.8.0 * @since 2.8.0
* @access public * @access public
* @abstract
* *
* @param array $args Display arguments including 'before_title', 'after_title', * @param array $args Display arguments including 'before_title', 'after_title',
* 'before_widget', and 'after_widget'. * 'before_widget', and 'after_widget'.
* @param array $instance The settings for the particular instance of the widget. * @param array $instance The settings for the particular instance of the widget.
*/ */
public function widget( $args, $instance ) { abstract public function widget( $args, $instance );
die('function WP_Widget::widget() must be over-ridden in a sub-class.');
}
/** /**
* Updates a particular instance of a widget. * Updates a particular instance of a widget.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37424'; $wp_version = '4.6-alpha-37425';
/** /**
* 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.