From e54e7b597ee05e9d06a76e4c7b958ea19ced6c30 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 28 Jan 2025 17:45:05 -0600 Subject: [PATCH 1/4] Remove mapping to Calypso URLs for Themes --- .../masterbar/src/admin-menu/class-admin-menu.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php index 4e52f6f966f05..cbc1decca272f 100644 --- a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php +++ b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php @@ -22,6 +22,7 @@ class Admin_Menu extends Base_Admin_Menu { * Create the desired menu output. */ public function reregister_menu_items() { + // Remove separators. remove_menu_page( 'separator1' ); $this->add_stats_menu(); @@ -295,9 +296,7 @@ public function add_appearance_menu() { $default_customize_background_slug_2 => add_query_arg( array( 'autofocus' => array( 'section' => 'colors_manager_tool' ) ), $customize_url ), ); - if ( self::DEFAULT_VIEW === $this->get_preferred_view( 'themes.php' ) ) { - $submenus_to_update['themes.php'] = 'https://wordpress.com/themes/' . $this->domain; - } + l( 'Themes remap removed' ); $this->update_submenus( 'themes.php', $submenus_to_update ); @@ -499,15 +498,15 @@ public function wp_ajax_upsell_nudge_jitm() {
- +
From e35529e47a831fc4490837ab0b98a6590af235c1 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 28 Jan 2025 17:46:48 -0600 Subject: [PATCH 2/4] changelog --- .../packages/masterbar/changelog/update-themes-url-to-wpadmin | 4 ++++ .../plugins/jetpack/changelog/update-themes-url-to-wpadmin | 4 ++++ .../mu-wpcom-plugin/changelog/update-themes-url-to-wpadmin | 4 ++++ .../plugins/wpcomsh/changelog/update-themes-url-to-wpadmin | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 projects/packages/masterbar/changelog/update-themes-url-to-wpadmin create mode 100644 projects/plugins/jetpack/changelog/update-themes-url-to-wpadmin create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/update-themes-url-to-wpadmin create mode 100644 projects/plugins/wpcomsh/changelog/update-themes-url-to-wpadmin diff --git a/projects/packages/masterbar/changelog/update-themes-url-to-wpadmin b/projects/packages/masterbar/changelog/update-themes-url-to-wpadmin new file mode 100644 index 0000000000000..a2579459224ee --- /dev/null +++ b/projects/packages/masterbar/changelog/update-themes-url-to-wpadmin @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +Update Themes page URL to go to WPAdmin view diff --git a/projects/plugins/jetpack/changelog/update-themes-url-to-wpadmin b/projects/plugins/jetpack/changelog/update-themes-url-to-wpadmin new file mode 100644 index 0000000000000..3ad8764e64e5b --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-themes-url-to-wpadmin @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +Changed Themes URL to be WPAdmin diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-themes-url-to-wpadmin b/projects/plugins/mu-wpcom-plugin/changelog/update-themes-url-to-wpadmin new file mode 100644 index 0000000000000..f06f1e0b5953d --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/update-themes-url-to-wpadmin @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +Updates Themes URL to point to WPAdmin diff --git a/projects/plugins/wpcomsh/changelog/update-themes-url-to-wpadmin b/projects/plugins/wpcomsh/changelog/update-themes-url-to-wpadmin new file mode 100644 index 0000000000000..f06f1e0b5953d --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/update-themes-url-to-wpadmin @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +Updates Themes URL to point to WPAdmin From f87edec09d61149ad25e89cc21fda3011f53b487 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 29 Jan 2025 00:03:04 +0000 Subject: [PATCH 3/4] Remove debug --- projects/packages/masterbar/src/admin-menu/class-admin-menu.php | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php index cbc1decca272f..db563a2f6aa49 100644 --- a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php +++ b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php @@ -296,7 +296,6 @@ public function add_appearance_menu() { $default_customize_background_slug_2 => add_query_arg( array( 'autofocus' => array( 'section' => 'colors_manager_tool' ) ), $customize_url ), ); - l( 'Themes remap removed' ); $this->update_submenus( 'themes.php', $submenus_to_update ); From c0e3adadf3c34fb7212ba459936105abca1b5a47 Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Wed, 29 Jan 2025 00:07:02 +0000 Subject: [PATCH 4/4] Update projects/packages/masterbar/src/admin-menu/class-admin-menu.php --- projects/packages/masterbar/src/admin-menu/class-admin-menu.php | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php index db563a2f6aa49..489dfc40ac4b2 100644 --- a/projects/packages/masterbar/src/admin-menu/class-admin-menu.php +++ b/projects/packages/masterbar/src/admin-menu/class-admin-menu.php @@ -22,7 +22,6 @@ class Admin_Menu extends Base_Admin_Menu { * Create the desired menu output. */ public function reregister_menu_items() { - // Remove separators. remove_menu_page( 'separator1' ); $this->add_stats_menu();