Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Setup Composer cache
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

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

2 changes: 1 addition & 1 deletion includes/Sites_Listing.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,6 @@ private function get_upsell_status() {
8 => 2,
9 => 3,
);
return ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2;
return apply_filters( 'product_neve_license_status', false ) !== 'valid' || ! isset( $category_mapping[ $category ] ) || $category_mapping[ $category ] < 2;
}
}
4 changes: 2 additions & 2 deletions includes/WP_Cli.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public function import( $args, $assoc_args ) {
$sites = $this->get_all_sites();
$site_slug = $args[0];
if ( ! array_key_exists( $site_slug, $sites ) ) {
\WP_CLI::warning( "No site to import with the slug ${site_slug}." );
\WP_CLI::warning( "No site to import with the slug {$site_slug}." );

return;
}
Expand Down Expand Up @@ -257,7 +257,7 @@ function ( &$item ) {
*/
private function import_xml_file( $path, $json, $editor ) {
if ( ! file_exists( $path ) || ! is_readable( $path ) ) {
\WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist (${path})" );
\WP_CLI::warning( "Cannot import XML file. Either the file is not readable or it does not exist ({$path})" );
}
$this->content_importer->import_file( $path, $json, $editor );
$this->content_importer->maybe_bust_elementor_cache();
Expand Down
Loading