Removed checks from ancient WP versions

skaut · Nov 19, 2024 · f7d900e · f7d900e
1 parent 5e0db87
commit f7d900e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/src/php/src/admin/class-admin.php b/src/php/src/admin/class-admin.php
@@ -118,22 +118,13 @@ public function add_logout_link_to_admin_bar( \WP_Admin_Bar $wp_admin_bar ) {
 		if ( ! is_admin_bar_showing() ) {
 			return;
 		}
-
-		if ( method_exists( $wp_admin_bar, 'get_node' ) ) {
-			if ( ! is_null( $wp_admin_bar->get_node( 'user-actions' ) ) ) {
-				$parent = 'user-actions';
-			} else {
-				return;
-			}
-		} elseif ( 1 === get_option( 'show_avatars' ) ) {
-			$parent = 'my-account-with-avatar';
-		} else {
-			$parent = 'my-account';
+		if ( is_null( $wp_admin_bar->get_node( 'user-actions' ) ) ) {
+			return;
 		}
 
 		$wp_admin_bar->add_menu(
 			array(
-				'parent' => $parent,
+				'parent' => 'user-actions',
 				'id'     => SKAUTIS_INTEGRATION_NAME . '_adminBar_logout',
 				'title'  => esc_html__( 'Log Out (too from skautIS)', 'skautis-integration' ),
 				'href'   => $this->wp_login_logout->get_logout_url(),

diff --git a/src/php/src/frontend/class-frontend.php b/src/php/src/frontend/class-frontend.php
@@ -145,22 +145,13 @@ public function add_logout_link_to_admin_bar( \WP_Admin_Bar $wp_admin_bar ) {
 		if ( ! is_admin_bar_showing() ) {
 			return;
 		}
-
-		if ( method_exists( $wp_admin_bar, 'get_node' ) ) {
-			if ( ! is_null( $wp_admin_bar->get_node( 'user-actions' ) ) ) {
-				$parent = 'user-actions';
-			} else {
-				return;
-			}
-		} elseif ( 1 === get_option( 'show_avatars' ) ) {
-			$parent = 'my-account-with-avatar';
-		} else {
-			$parent = 'my-account';
+		if ( is_null( $wp_admin_bar->get_node( 'user-actions' ) ) ) {
+			return;
 		}
 
 		$wp_admin_bar->add_menu(
 			array(
-				'parent' => $parent,
+				'parent' => 'user-actions',
 				'id'     => SKAUTIS_INTEGRATION_NAME . '_adminBar_logout',
 				'title'  => esc_html__( 'Odhlásit se (i ze skautISu)', 'skautis-integration' ),
 				'href'   => $this->wp_login_logout->get_logout_url(),