← All changes | common/helpers.php +27 -23 trunk → 0.3.8 View file →

		@@ -1,10 +1,10 @@
1	1	<?php
2	2
3		-if ( !class_exists( 'MeowKit_MWCODE_Helpers' ) ) {
	3	+if ( !class_exists( 'MeowCommon_Helpers' ) ) {
4	4
5		- class MeowKit_MWCODE_Helpers {
6		- //public static $version = MeowKit_MWCODE_Admin::version;
	5	+ class MeowCommon_Helpers {
	6	+ //public static $version = MeowCommon_Admin::version;
7	7	private static $startTimes = [];
8	8	private static $startQueries = [];
9	9
10	10	public static function is_divi_builder() {
		@@ -97,21 +97,21 @@
97	97	public static function is_rest() {
98	98
99	99	// WP 6.5+: only reliable after parse_request; otherwise skip this branch.
100	100	if ( function_exists( 'wp_is_serving_rest_request' ) && did_action( 'parse_request' ) && wp_is_serving_rest_request() ) {
101		- MeowKit_MWCODE_Rest::init_once();
	101	+ MeowCommon_Rest::init_once();
102	102	return true;
103	103	}
104	104
105	105	// Classic flag set during REST bootstrap (safe at any time).
106	106	if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
107		- MeowKit_MWCODE_Rest::init_once();
	107	+ MeowCommon_Rest::init_once();
108	108	return true;
109	109	}
110	110
111	111	// Plain permalinks: ?rest_route=/... (route does NOT include the prefix).
112	112	if ( isset( $_GET['rest_route'] ) ) {
113		- MeowKit_MWCODE_Rest::init_once();
	113	+ MeowCommon_Rest::init_once();
114	114	return true;
115	115	}
116	116
117	117	// Pretty permalinks: compare request PATH to the site's REST base path, without using rest_url().
		@@ -117,18 +117,22 @@
117	117	// Pretty permalinks: compare request PATH to the site's REST base path, without using rest_url().
118	118	// This works early in the bootstrap (no dependency on $wp_rewrite).
119	119	$req_path = isset( $_SERVER['REQUEST_URI'] ) ? wp_parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) : null;
120	120	if ( $req_path ) {
121		- $prefix = rest_get_url_prefix(); // e.g. 'wp-json' or custom
	121	+ $home_path = wp_parse_url( home_url( '/' ), PHP_URL_PATH ); // e.g. '/' or '/blog/'
	122	+ $home_path = trailingslashit( $home_path ? $home_path : '/' );
122	123
123		- // Check if the path contains /wp-json/ or /index.php/wp-json/
124		- // This handles multilingual plugins (WPML, Polylang) that add language prefixes like /fr/wp-json/
	124	+ $prefix = trim( rest_get_url_prefix(), '/' ); // e.g. 'wp-json' or custom
	125	+
	126	+ // /wp-json/ or /blog/wp-json/
	127	+ $base = $home_path . trailingslashit( $prefix );
	128	+
	129	+ // /index.php/wp-json/ or /blog/index.php/wp-json/ (index permalinks)
	130	+ $base_index = $home_path . 'index.php/' . trailingslashit( $prefix );
	131	+
125	132	$path = trailingslashit( $req_path );
126		- $rest_pattern = '/' . trim( $prefix, '/' ) . '/';
127		- $rest_pattern_index = '/index.php/' . trim( $prefix, '/' ) . '/';
128		-
129		- if ( strpos( $path, $rest_pattern ) !== false || strpos( $path, $rest_pattern_index ) !== false ) {
130		- MeowKit_MWCODE_Rest::init_once();
	133	+ if ( strpos( $path, $base ) === 0 || strpos( $path, $base_index ) === 0 ) {
	134	+ MeowCommon_Rest::init_once();
131	135	return true;
132	136	}
133	137	}
134	138
		@@ -140,9 +144,9 @@
140	144
141	145	// // WP_REST_Request init.
142	146	// $is_rest_request = defined( 'REST_REQUEST' ) && REST_REQUEST;
143	147	// if ( $is_rest_request ) {
144		- // MeowKit_MWCODE_Rest::init_once();
	148	+ // MeowCommon_Rest::init_once();
145	149	// return true;
146	150	// }
147	151
148	152	// // Plain permalinks.
		@@ -148,9 +152,9 @@
148	152	// // Plain permalinks.
149	153	// $prefix = rest_get_url_prefix();
150	154	// $request_contains_rest = isset( $_GET['rest_route'] ) && strpos( trim( $_GET['rest_route'], '\\/' ), $prefix, 0 ) === 0;
151	155	// if ( $request_contains_rest ) {
152		- // MeowKit_MWCODE_Rest::init_once();
	156	+ // MeowCommon_Rest::init_once();
153	157	// return true;
154	158	// }
155	159
156	160	// // It can happen that WP_Rewrite is not yet initialized, so better to do it.
		@@ -167,9 +171,9 @@
167	171	// // URL Path begins with wp-json.
168	172	// if ( !empty( $current_url['path'] ) && !empty( $rest_url['path'] ) ) {
169	173	// $request_contains_rest = strpos( $current_url['path'], $rest_url['path'], 0 ) === 0;
170	174	// if ( $request_contains_rest ) {
171		- // MeowKit_MWCODE_Rest::init_once();
	175	+ // MeowCommon_Rest::init_once();
172	176	// return true;
173	177	// }
174	178	// }
175	179
		@@ -276,19 +280,19 @@
276	280	// }
277	281	}
278	282
279	283	public static function timer_start( $timerName = 'default' ) {
280		- MeowKit_MWCODE_Helpers::$startQueries[ $timerName ] = get_num_queries();
281		- MeowKit_MWCODE_Helpers::$startTimes[ $timerName ] = microtime( true );
	284	+ MeowCommon_Helpers::$startQueries[ $timerName ] = get_num_queries();
	285	+ MeowCommon_Helpers::$startTimes[ $timerName ] = microtime( true );
282	286	}
283	287
284	288	public static function timer_elapsed( $timerName = 'default' ) {
285		- return microtime( true ) - MeowKit_MWCODE_Helpers::$startTimes[ $timerName ];
	289	+ return microtime( true ) - MeowCommon_Helpers::$startTimes[ $timerName ];
286	290	}
287	291
288	292	public static function timer_log_elapsed( $timerName = 'default' ) {
289		- $elapsed = MeowKit_MWCODE_Helpers::timer_elapsed( $timerName );
290		- $queries = get_num_queries() - MeowKit_MWCODE_Helpers::$startQueries[ $timerName ];
	293	+ $elapsed = MeowCommon_Helpers::timer_elapsed( $timerName );
	294	+ $queries = get_num_queries() - MeowCommon_Helpers::$startQueries[ $timerName ];
291	295	error_log( $timerName . ': ' . $elapsed . 'ms (' . $queries . ' queries)' );
292	296	}
293	297	}
294	298
		@@ -293,8 +297,8 @@
293	297	}
294	298
295	299	// Asked by WP Security Team to remove this.
296	300
297		- // if ( MeowKit_MWCODE_Helpers::is_rest() ) {
	301	+ // if ( MeowCommon_Helpers::is_rest() ) {
298	302	// ini_set( 'display_errors', 0 );
299	303	// }
300	304	}