← All changes | modules/widgets.php +15 -54 12.2.3 → 6.2 View file →

		@@ -1,26 +1,21 @@
1	1	<?php
2	2	/**
3	3	* Module Name: Extra Sidebar Widgets
4		- * Module Description: Provides additional widgets for use on your site.
	4	+ * Module Description: Add images, Twitter streams, and more to your sidebar.
5	5	* Sort Order: 4
6	6	* First Introduced: 1.2
7	7	* Requires Connection: No
8		- * Auto Activate: No
	8	+ * Auto Activate: Yes
9	9	* Module Tags: Social, Appearance
10	10	* Feature: Appearance
11	11	* Additional Search Queries: widget, widgets, facebook, gallery, twitter, gravatar, image, rss
12		- *
13		- * @package automattic/jetpack
14	12	*/
15	13
16		-/**
17		- * Load Jetpack widget files.
18		- */
19	14	function jetpack_load_widgets() {
20	15	$widgets_include = array();
21	16
22		- foreach ( Jetpack::glob_php( __DIR__ . '/widgets' ) as $file ) {
	17	+ foreach ( Jetpack::glob_php( dirname( __FILE__ ) . '/widgets' ) as $file ) {
23	18	$widgets_include[] = $file;
24	19	}
25	20	/**
26	21	* Modify which Jetpack Widgets to register.
		@@ -32,35 +27,30 @@
32	27	* @param array $widgets_include An array of widgets to be registered.
33	28	*/
34	29	$widgets_include = apply_filters( 'jetpack_widgets_to_include', $widgets_include );
35	30
36		- foreach ( $widgets_include as $include ) {
	31	+ foreach( $widgets_include as $include ) {
37	32	include_once $include;
38	33	}
39	34
40		- include_once __DIR__ . '/widgets/migrate-to-core/image-widget.php';
41		- include_once __DIR__ . '/widgets/migrate-to-core/gallery-widget.php';
	35	+ include_once dirname( __FILE__ ) . '/widgets/migrate-to-core/image-widget.php';
	36	+ include_once dirname( __FILE__ ) . '/widgets/migrate-to-core/gallery-widget.php';
42	37	}
43	38
44	39	add_action( 'jetpack_modules_loaded', 'jetpack_widgets_loaded' );
45		-/**
46		- * Actions to perform after Jetpack widgets are loaded.
47		- */
	40	+
48	41	function jetpack_widgets_loaded() {
49	42	Jetpack::enable_module_configurable( __FILE__ );
50		- add_filter( 'jetpack_module_configuration_url_widgets', 'jetpack_widgets_configuration_url' );
	43	+ Jetpack::module_configuration_load( __FILE__, 'jetpack_widgets_configuration_load' );
51	44	}
52	45
53		-/**
54		- * Overrides default configuration url
55		- *
56		- * @uses admin_url
57		- * @return string module settings URL
58		- */
59		-function jetpack_widgets_configuration_url() {
60		- return admin_url( 'customize.php?autofocus[panel]=widgets' );
	46	+function jetpack_widgets_configuration_load() {
	47	+ wp_safe_redirect( admin_url( 'widgets.php' ) );
	48	+ exit;
61	49	}
62	50
	51	+
	52	+
63	53	jetpack_load_widgets();
64	54
65	55	/**
66	56	* Enqueue utilities to work with widgets in Customizer.
		@@ -67,15 +57,9 @@
67	57	*
68	58	* @since 4.4.0
69	59	*/
70	60	function jetpack_widgets_customizer_assets_preview() {
71		- wp_enqueue_script(
72		- 'jetpack-customizer-widget-utils',
73		- plugins_url( '/widgets/customizer-utils.js', __FILE__ ),
74		- array( 'jquery', 'customize-base' ),
75		- JETPACK__VERSION,
76		- false
77		- );
	61	+ wp_enqueue_script( 'jetpack-customizer-widget-utils', plugins_url( '/widgets/customizer-utils.js', __FILE__ ), array( 'customize-base' ) );
78	62	}
79	63	add_action( 'customize_preview_init', 'jetpack_widgets_customizer_assets_preview' );
80	64
81	65	/**
		@@ -83,30 +67,7 @@
83	67	*
84	68	* @since 4.4.0
85	69	*/
86	70	function jetpack_widgets_customizer_assets_controls() {
87		- wp_enqueue_style(
88		- 'jetpack-customizer-widget-controls',
89		- plugins_url( '/widgets/customizer-controls.css', __FILE__ ),
90		- array( 'customize-widgets' ),
91		- JETPACK__VERSION
92		- );
	71	+ wp_enqueue_style( 'jetpack-customizer-widget-controls', plugins_url( '/widgets/customizer-controls.css', __FILE__ ), array( 'customize-widgets' ) );
93	72	}
94	73	add_action( 'customize_controls_enqueue_scripts', 'jetpack_widgets_customizer_assets_controls' );
95		-
96		-/**
97		- * Cleanup old Jetpack widgets data.
98		- */
99		-function jetpack_widgets_remove_old_widgets() {
100		- $old_widgets = array(
101		- 'googleplus-badge',
102		- );
103		-
104		- // Don't bother cleaning up the sidebars_widgets data.
105		- // That will get cleaned up the next time a widget is
106		- // added, removed, moved, etc.
107		- foreach ( $old_widgets as $old_widget ) {
108		- delete_option( "widget_{$old_widget}" );
109		- }
110		-}
111		-
112		-add_action( 'updating_jetpack_version', 'jetpack_widgets_remove_old_widgets' );