Merge branch 'develop' into ari/auto-register-if-branded

ilicfilip · web-flow · commit 17767a64851f · 2025-09-23T13:22:35.000+02:00
diff --git a/classes/ui/class-branding.php b/classes/ui/class-branding.php
@@ -38,6 +38,9 @@ public function get_branding_id(): int {
 		if ( \defined( 'PROGRESS_PLANNER_BRANDING_ID' ) ) {
 			return \constant( 'PROGRESS_PLANNER_BRANDING_ID' );
 		}
+		if ( isset( $_GET['pp_branding_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			return (int) $_GET['pp_branding_id']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		}
 
 		$hostname = (string) \gethostname();
 		if ( \str_contains( $hostname, 'siteground' ) ) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ public function get_branding_id(): int {`
`38`	`38`	`if ( \defined( 'PROGRESS_PLANNER_BRANDING_ID' ) ) {`
`39`	`39`	`return \constant( 'PROGRESS_PLANNER_BRANDING_ID' );`
`40`	`40`	`}`
	`41`	`+ if ( isset( $_GET['pp_branding_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended`
	`42`	`+ return (int) $_GET['pp_branding_id']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended`
	`43`	`+ }`
`41`	`44`
`42`	`45`	`$hostname = (string) \gethostname();`
`43`	`46`	`if ( \str_contains( $hostname, 'siteground' ) ) {`