← All changes | json-endpoints/class.wpcom-json-api-render-endpoint.php +8 -4 12.0.3 → 16.3-a.1 View file →

		@@ -1,6 +1,10 @@
1	1	<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
2	2
	3	+if ( ! defined( 'ABSPATH' ) ) {
	4	+ exit( 0 );
	5	+}
	6	+
3	7	/**
4	8	* These are helpers for the shortcode and embed render endpoints.
5	9	*/
6	10	abstract class WPCOM_JSON_API_Render_Endpoint extends WPCOM_JSON_API_Endpoint {
		@@ -20,9 +24,9 @@
20	24	*/
21	25	public function process_render( $callback, $callback_arg ) {
22	26	global $wp_scripts, $wp_styles;
23	27
24		- if ( false === defined( 'STYLESHEETPATH' ) ) {
	28	+ if ( ! defined( 'STYLESHEETPATH' ) ) {
25	29	wp_templating_constants();
26	30	}
27	31
28	32	// initial scripts & styles (to subtract)
		@@ -63,9 +67,9 @@
63	67	*/
64	68	public function add_assets( $return, $loaded_scripts, $loaded_styles ) {
65	69	global $wp_scripts, $wp_styles;
66	70	// scripts first, just cuz
67		- if ( count( $loaded_scripts ) > 0 ) {
	71	+ if ( $loaded_scripts !== array() ) {
68	72	$scripts = array();
69	73	foreach ( $loaded_scripts as $handle ) {
70	74	if ( ! isset( $wp_scripts->registered[ $handle ] ) ) {
71	75	continue;
		@@ -91,9 +95,9 @@
91	95	}
92	96	$return['scripts'] = $scripts;
93	97	}
94	98	// now styles
95		- if ( count( $loaded_styles ) > 0 ) {
	99	+ if ( $loaded_styles !== array() ) {
96	100	$styles = array();
97	101	foreach ( $loaded_styles as $handle ) {
98	102	if ( ! isset( $wp_styles->registered[ $handle ] ) ) {
99	103	continue;
		@@ -110,9 +114,9 @@
110	114
111	115	// is there a special media (print, screen, etc) for this? if not, default to 'all'
112	116	$media = 'all';
113	117	if ( isset( $wp_styles->registered[ $handle ]->args ) ) {
114		- $media = esc_attr( $wp_styles->registered[ $handle ]->args );
	118	+ $media = esc_attr( (string) $wp_styles->registered[ $handle ]->args );
115	119	}
116	120
117	121	// add to an array so we can return all this info
118	122	$styles[ $handle ] = array(