Merge branch 'develop' into ari/fix-pro/135

Author: aristath

assets/js/editor.js

@@ -71,7 +71,7 @@ const PrplRenderPageTypeSelector = () => {
 		value: wp.data.useSelect( ( select ) => {
 			const pageTypeArr =
 				select( 'core/editor' ).getEditedPostAttribute( TAXONOMY );
-			return 0 < pageTypeArr.length
+			return pageTypeArr && 0 < pageTypeArr.length
 				? parseInt( pageTypeArr[ 0 ] )
 				: parseInt( progressPlannerEditor.defaultPageType );
 		}, [] ),

classes/admin/class-editor.php

@@ -27,7 +27,10 @@ public function __construct() {
 	public function enqueue_editor_script() {
 		// Bail early when we're on the site-editor.php page.
 		$request = \filter_input( INPUT_SERVER, 'REQUEST_URI' );
-		if ( false !== \strpos( (string) $request, '/site-editor.php' ) ) {
+		if ( ! $request && isset( $_SERVER['REQUEST_URI'] ) ) {
+			$request = \sanitize_text_field( \wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		}
+		if ( $request && str_contains( $request, 'site-editor.php' ) ) {
 			return;
 		}