Merge pull request #689 from 10up/fix/658

For super admins with no role set, treat them as administrators
10up · Feb 5, 2024 · f5e9c60 · f5e9c60
2 parents 0180001 + e8c37e7
commit f5e9c60
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/includes/Classifai/Admin/UserProfile.php b/includes/Classifai/Admin/UserProfile.php
@@ -158,13 +158,19 @@ public function get_allowed_features( int $user_id ): array {
 
 				// Check if user has access to the feature by role.
 				$allowed_roles = $settings['roles'] ?? [];
-				if (
-					$role_based_access_enabled &&
-					! empty( $allowed_roles ) &&
-					! empty( array_intersect( $user_roles, $allowed_roles ) )
-				) {
-					$allowed_features[ $feature_class::ID ] = $feature_class->get_label();
-					continue;
+				if ( $role_based_access_enabled ) {
+					// For super admins that don't have a specific role on a site, treat them as admins.
+					if ( is_multisite() && is_super_admin( $user_id ) && empty( $user_roles ) ) {
+						$user_roles = [ 'administrator' ];
+					}
+
+					if (
+						! empty( $allowed_roles ) &&
+						! empty( array_intersect( $user_roles, $allowed_roles ) )
+					) {
+						$allowed_features[ $feature_class::ID ] = $feature_class->get_label();
+						continue;
+					}
 				}
 
 				// Check if user has access to the feature.

diff --git a/includes/Classifai/Features/Feature.php b/includes/Classifai/Features/Feature.php
@@ -938,6 +938,11 @@ public function has_access(): bool {
 		 * Checks if Role-based access is enabled and user role has access to the feature.
 		 */
 		if ( $role_based_access_enabled ) {
+			// For super admins that don't have a specific role on a site, treat them as admins.
+			if ( is_multisite() && is_super_admin( $user_id ) && empty( $user_roles ) ) {
+				$user_roles = [ 'administrator' ];
+			}
+
 			$access = ( ! empty( $feature_roles ) && ! empty( array_intersect( $user_roles, $feature_roles ) ) );
 		}