WordPress.org
Get WordPress

Plugin Directory

Changeset 3170304


Ignore:
Timestamp:
10/16/2024 07:29:19 PM (18 months ago)
Author:
Ecwid
Message:

Update to version 6.12.21 from GitHub

Location:
ecwid-shopping-cart
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • ecwid-shopping-cart/tags/6.12.21/ecwid-shopping-cart.php

    r3162045 r3170304  
    66Text Domain: ecwid-shopping-cart
    77Author: Ecwid Ecommerce
    8 Version: 6.12.20
     8Version: 6.12.21
    99Author URI: https://ecwid.to/ecwid-site
    1010License: GPLv2 or later
    … …  
    16431643    $is_newbie = ecwid_is_demo_store();
    16441644
    1645     if( !$is_cli_running && $is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
     1645    if( !$is_cli_running && !$is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
    16461646        wp_safe_redirect( Ecwid_Admin::get_dashboard_url() );
    16471647        exit();
    … …  
    29892989function ecwid_is_paid_account()
    29902990{
    2991     return false;
    29922991    if ( Ecwid_Api_V3::is_available() ) {
    29932992        $api = new Ecwid_Api_V3();

  • ecwid-shopping-cart/tags/6.12.21/includes/class-ecwid-admin-main-page.php

    r3118980 r3170304  
    147147        }//end if
    148148
    149         if ( $result['code'] == 403 ) {
    150             Ecwid_Api_V3::save_token( '' );
     149        $need_to_force_show_dashboard = false;
     150
     151        if ( ! empty( $result ) && $result['code'] == 403 ) {
     152            if ( get_option( EcwidPlatform::OPTION_ECWID_CHECK_API_RETRY_AFTER, 0 ) == 0 ) {
     153                Ecwid_Api_V3::set_api_status( Ecwid_Api_V3::API_STATUS_ERROR_TOKEN );
     154                Ecwid_Api_V3::save_token( '' );
     155            } else {
     156                update_option( EcwidPlatform::OPTION_ECWID_CHECK_API_RETRY_AFTER, time() + 5 * MINUTE_IN_SECONDS );
     157                $need_to_force_show_dashboard = true;
     158            }
    151159        }
    152160
    153161        if ( empty( $result['code'] ) && empty( $result['data'] ) || $result['code'] == 500 ) {
    154162            require_once ECWID_PLUGIN_DIR . 'templates/admin-timeout.php';
    155         } elseif ( $result['code'] != 200 ) {
     163        } elseif ( $result['code'] != 200 && ! $need_to_force_show_dashboard ) {
    156164            if ( ecwid_test_oauth( true ) ) {
    157165                require_once ECWID_PLUGIN_DIR . 'templates/reconnect-sso.php';

  • ecwid-shopping-cart/tags/6.12.21/readme.txt

    r3162045 r3170304  
    66Requires at least: 4.4
    77Tested up to: 6.6
    8 Stable tag: 6.12.20
     8Stable tag: 6.12.21
    99
    1010Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available.
    … …  
    154154
    155155== Changelog ==
     156= 6.12.21 - Oct 16, 2024 =
     157- Fixed issue with Single Sign On (SSO). Single Sign-On allows your customers to have a single login for both your WordPress site and your Ecwid store. If this feature is not working properly after latests release, please update your plugin.
     158- Internal improvements and optimizations.
     159
    156160= 6.12.20 - Oct 3, 2024 =
    157161- In the "Only featured products" mode, the "Store Home Page" ecommerce block was displayed incorrectly. We've fixed this.

  • ecwid-shopping-cart/tags/6.12.21/templates/debug.php

    r3149860 r3170304  
    7878        <div>Theme identification</div>
    7979        <div><?php echo esc_html( ecwid_get_theme_identification() ); ?></div>
     80    </div>
     81    <div class="section">
     82        <div>Config URLs matching</div>
     83        <div>
     84        <p>
     85        <?php
     86        if ( defined( 'WP_SITEURL' ) ) {
     87            echo esc_html( sprintf( 'WP_SITEURL: %s', WP_SITEURL ) );
     88        } else {
     89            echo 'WP_SITEURL isn\'t defined';
     90        }
     91        ?>
     92        </p>
     93        <p><?php echo esc_html( sprintf( "Option 'siteurl': %s", get_option( 'siteurl' ) ) ); ?></p>
     94        <p><?php echo esc_html( sprintf( 'admin_url(): %s', admin_url() ) ); ?></p>
     95        </div>
    8096    </div>
    8197    <div class="section">

  • ecwid-shopping-cart/trunk/ecwid-shopping-cart.php

    r3162045 r3170304  
    66Text Domain: ecwid-shopping-cart
    77Author: Ecwid Ecommerce
    8 Version: 6.12.20
     8Version: 6.12.21
    99Author URI: https://ecwid.to/ecwid-site
    1010License: GPLv2 or later
    … …  
    16431643    $is_newbie = ecwid_is_demo_store();
    16441644
    1645     if( !$is_cli_running && $is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
     1645    if( !$is_cli_running && !$is_wp_playground && !$is_bulk_activation && $is_newbie && $plugin == plugin_basename( __FILE__ ) ) {
    16461646        wp_safe_redirect( Ecwid_Admin::get_dashboard_url() );
    16471647        exit();
    … …  
    29892989function ecwid_is_paid_account()
    29902990{
    2991     return false;
    29922991    if ( Ecwid_Api_V3::is_available() ) {
    29932992        $api = new Ecwid_Api_V3();

  • ecwid-shopping-cart/trunk/includes/class-ecwid-admin-main-page.php

    r3118980 r3170304  
    147147        }//end if
    148148
    149         if ( $result['code'] == 403 ) {
    150             Ecwid_Api_V3::save_token( '' );
     149        $need_to_force_show_dashboard = false;
     150
     151        if ( ! empty( $result ) && $result['code'] == 403 ) {
     152            if ( get_option( EcwidPlatform::OPTION_ECWID_CHECK_API_RETRY_AFTER, 0 ) == 0 ) {
     153                Ecwid_Api_V3::set_api_status( Ecwid_Api_V3::API_STATUS_ERROR_TOKEN );
     154                Ecwid_Api_V3::save_token( '' );
     155            } else {
     156                update_option( EcwidPlatform::OPTION_ECWID_CHECK_API_RETRY_AFTER, time() + 5 * MINUTE_IN_SECONDS );
     157                $need_to_force_show_dashboard = true;
     158            }
    151159        }
    152160
    153161        if ( empty( $result['code'] ) && empty( $result['data'] ) || $result['code'] == 500 ) {
    154162            require_once ECWID_PLUGIN_DIR . 'templates/admin-timeout.php';
    155         } elseif ( $result['code'] != 200 ) {
     163        } elseif ( $result['code'] != 200 && ! $need_to_force_show_dashboard ) {
    156164            if ( ecwid_test_oauth( true ) ) {
    157165                require_once ECWID_PLUGIN_DIR . 'templates/reconnect-sso.php';

  • ecwid-shopping-cart/trunk/readme.txt

    r3162045 r3170304  
    66Requires at least: 4.4
    77Tested up to: 6.6
    8 Stable tag: 6.12.20
     8Stable tag: 6.12.21
    99
    1010Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support. Free plan available.
    … …  
    154154
    155155== Changelog ==
     156= 6.12.21 - Oct 16, 2024 =
     157- Fixed issue with Single Sign On (SSO). Single Sign-On allows your customers to have a single login for both your WordPress site and your Ecwid store. If this feature is not working properly after latests release, please update your plugin.
     158- Internal improvements and optimizations.
     159
    156160= 6.12.20 - Oct 3, 2024 =
    157161- In the "Only featured products" mode, the "Store Home Page" ecommerce block was displayed incorrectly. We've fixed this.

  • ecwid-shopping-cart/trunk/templates/debug.php

    r3149860 r3170304  
    7878        <div>Theme identification</div>
    7979        <div><?php echo esc_html( ecwid_get_theme_identification() ); ?></div>
     80    </div>
     81    <div class="section">
     82        <div>Config URLs matching</div>
     83        <div>
     84        <p>
     85        <?php
     86        if ( defined( 'WP_SITEURL' ) ) {
     87            echo esc_html( sprintf( 'WP_SITEURL: %s', WP_SITEURL ) );
     88        } else {
     89            echo 'WP_SITEURL isn\'t defined';
     90        }
     91        ?>
     92        </p>
     93        <p><?php echo esc_html( sprintf( "Option 'siteurl': %s", get_option( 'siteurl' ) ) ); ?></p>
     94        <p><?php echo esc_html( sprintf( 'admin_url(): %s', admin_url() ) ); ?></p>
     95        </div>
    8096    </div>
    8197    <div class="section">
Note: See TracChangeset for help on using the changeset viewer.