Skip to content

Commit

Permalink
Launch the WP.com themes banner in wp-admin to all users (#36935)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmtr authored and matticbot committed Apr 19, 2024
1 parent 68ca772 commit ae5cbc8
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-mu-wpcom": "^5.24.1-alpha"
"automattic/jetpack-mu-wpcom": "^5.25.0-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.24.1-alpha] - unreleased
## [5.25.0-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Added
- Add missing dependency on `automattic/jetpack-status`.

### Changed
- Launch the WP.com themes banner in wp-admin to all users

### Fixed
- Added completed callback for site_launched task
- Fixed a WP.com only issue that forced the Themes menu to always point to Calypso even when the classic interface was set
Expand Down Expand Up @@ -742,7 +745,7 @@ This is an alpha version! The changes listed here are not final.

- Testing initial package release.

[5.24.1-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.24.0...v5.24.1-alpha
[5.25.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.24.0...v5.25.0-alpha
[5.24.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.23.2...v5.24.0
[5.23.2]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.23.1...v5.23.2
[5.23.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.23.0...v5.23.1
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-mu-wpcom/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"autotagger": true,
"branch-alias": {
"dev-trunk": "5.24.x-dev"
"dev-trunk": "5.25.x-dev"
},
"textdomain": "jetpack-mu-wpcom",
"version-constants": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Jetpack_Mu_Wpcom main class.
*/
class Jetpack_Mu_Wpcom {
const PACKAGE_VERSION = '5.24.1-alpha';
const PACKAGE_VERSION = '5.25.0-alpha';
const PKG_DIR = __DIR__ . '/../';
const BASE_DIR = __DIR__ . '/';
const BASE_FILE = __FILE__;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
* Displays a banner before the theme browser that links to the WP.com Theme Showcase.
*/
function wpcom_themes_show_banner() {
if ( ! function_exists( 'wpcom_is_nav_redesign_enabled' ) || ! wpcom_is_nav_redesign_enabled() ) {
return;
}

$site_slug = wp_parse_url( home_url(), PHP_URL_HOST );
$wpcom_logo = plugins_url( 'images/wpcom-logo.svg', __FILE__ );
$background_image = plugins_url( 'images/banner-background.webp', __FILE__ );
Expand Down
16 changes: 8 additions & 8 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "a6c68abf8508922e46f0c8dcb32d533727f51d15"
"reference": "e8b2ca6e169ec81d7f66ce685998c39490d4e53a"
},
"require": {
"automattic/jetpack-constants": "^2.0.1",
Expand Down Expand Up @@ -76,7 +76,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "bc4cefb432915bd5aca06a9fb763101b33c22097"
"reference": "1e3a98f4253ca6ab7ff2ab9be4c3bbe3184ecbbd"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,12 +125,12 @@
},
{
"name": "automattic/jetpack-mu-wpcom",
"version": "5.24.1-alpha.1713536770",
"version_normalized": "5.24.1.0-alpha1713536770",
"version": "5.25.0-alpha.1713537726",
"version_normalized": "5.25.0.0-alpha1713537726",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
"reference": "a3cd572a86c907637c81a9ae456ebca3f475bfc3"
"reference": "7aee7c51c7b1e3eacf33d24e4f6f39697dcb9f23"
},
"require": {
"automattic/jetpack-assets": "^2.1.8-alpha",
Expand All @@ -154,7 +154,7 @@
},
"autotagger": true,
"branch-alias": {
"dev-trunk": "5.24.x-dev"
"dev-trunk": "5.25.x-dev"
},
"textdomain": "jetpack-mu-wpcom",
"version-constants": {
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "b694e7b2c53fe72c95ae2e8cc9c3a4d508b925d8"
"reference": "5136a80e2e8999c1c1e06ea5e68659369ee34387"
},
"require": {
"automattic/jetpack-constants": "^2.0.1",
Expand Down Expand Up @@ -259,7 +259,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/scheduled-updates",
"reference": "6f019910526d693e5943096cc9307da8b5eb54d7"
"reference": "e1dc18c3d7b44886ea73501208f95095e2dc5b28"
},
"require": {
"php": ">=7.0"
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'automattic/jetpack-assets' => array(
'pretty_version' => '2.1.8-alpha.1713286100',
'version' => '2.1.8.0-alpha1713286100',
'reference' => 'a6c68abf8508922e46f0c8dcb32d533727f51d15',
'reference' => 'e8b2ca6e169ec81d7f66ce685998c39490d4e53a',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-assets',
'aliases' => array(),
Expand All @@ -22,16 +22,16 @@
'automattic/jetpack-constants' => array(
'pretty_version' => '2.0.1',
'version' => '2.0.1.0',
'reference' => 'bc4cefb432915bd5aca06a9fb763101b33c22097',
'reference' => '1e3a98f4253ca6ab7ff2ab9be4c3bbe3184ecbbd',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-constants',
'aliases' => array(),
'dev_requirement' => false,
),
'automattic/jetpack-mu-wpcom' => array(
'pretty_version' => '5.24.1-alpha.1713536770',
'version' => '5.24.1.0-alpha1713536770',
'reference' => 'a3cd572a86c907637c81a9ae456ebca3f475bfc3',
'pretty_version' => '5.25.0-alpha.1713537726',
'version' => '5.25.0.0-alpha1713537726',
'reference' => '7aee7c51c7b1e3eacf33d24e4f6f39697dcb9f23',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom',
'aliases' => array(),
Expand All @@ -49,7 +49,7 @@
'automattic/jetpack-status' => array(
'pretty_version' => '2.2.2-alpha.1713536770',
'version' => '2.2.2.0-alpha1713536770',
'reference' => 'b694e7b2c53fe72c95ae2e8cc9c3a4d508b925d8',
'reference' => '5136a80e2e8999c1c1e06ea5e68659369ee34387',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/jetpack-status',
'aliases' => array(),
Expand All @@ -58,7 +58,7 @@
'automattic/scheduled-updates' => array(
'pretty_version' => '0.8.0-alpha.1713536770',
'version' => '0.8.0.0-alpha1713536770',
'reference' => '6f019910526d693e5943096cc9307da8b5eb54d7',
'reference' => 'e1dc18c3d7b44886ea73501208f95095e2dc5b28',
'type' => 'jetpack-library',
'install_path' => __DIR__ . '/../automattic/scheduled-updates',
'aliases' => array(),
Expand Down

0 comments on commit ae5cbc8

Please sign in to comment.