Merge pull request #3609 from flintfromthebasement/fix/members-per-level-corechart-double-load

dparker1005 · web-flow · commit ab247f055a0c · 2026-03-13T11:05:07.000-04:00
Fix operator precedence bug causing corechart.js to load on all report pages
diff --git a/adminpages/reports/members-per-level.php b/adminpages/reports/members-per-level.php
@@ -19,7 +19,7 @@ function pmpro_report_members_per_level_register( $pmpro_reports ) {
 
 // Enqueue Google Visualization JS on report page
 function pmpro_report_members_per_level_init() {
-	if ( is_admin() && ( isset( $_REQUEST['report'] ) && $_REQUEST[ 'report' ] == 'members_per_level' ) || ( isset( $_REQUEST['page'] ) && $_REQUEST[ 'page' ] == 'pmpro-reports' ) ) {
+	if ( is_admin() && isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'pmpro-reports' && isset( $_REQUEST['report'] ) && $_REQUEST['report'] == 'members_per_level' ) {
 		wp_enqueue_script( 'corechart', plugins_url( 'js/corechart.js',  plugin_dir_path( __DIR__ ) ) );
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function pmpro_report_members_per_level_register( $pmpro_reports ) {`
`19`	`19`
`20`	`20`	`// Enqueue Google Visualization JS on report page`
`21`	`21`	`function pmpro_report_members_per_level_init() {`
`22`		`- if ( is_admin() && ( isset( $_REQUEST['report'] ) && $_REQUEST[ 'report' ] == 'members_per_level' ) \|\| ( isset( $_REQUEST['page'] ) && $_REQUEST[ 'page' ] == 'pmpro-reports' ) ) {`
	`22`	`+ if ( is_admin() && isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'pmpro-reports' && isset( $_REQUEST['report'] ) && $_REQUEST['report'] == 'members_per_level' ) {`
`23`	`23`	`wp_enqueue_script( 'corechart', plugins_url( 'js/corechart.js', plugin_dir_path( __DIR__ ) ) );`
`24`	`24`	`}`
`25`	`25`	`}`