Skip to content

Commit d657b33

Browse files
committed
fix acf conflicts
1 parent f164c99 commit d657b33

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Tags: helloasso, paiement, association, crowdfunding, don
55
Requires at least: 4.0
66
Tested up to: 6.8
77
Requires PHP: 7.2.34
8-
Stable tag: 1.1.19
8+
Stable tag: 1.1.20
99
License: GPLv2 or later
1010
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1111

@@ -81,6 +81,9 @@ Please report security bugs found in the source code of the helloasso plugin thr
8181

8282
== Changelog ==
8383

84+
= 1.1.20 =
85+
* Correciton de conflit avec ACF
86+
8487
= 1.1.19 =
8588
* Les widgets se redimensionnent automatiquement
8689

admin/class-hello-asso-admin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function wporg_custom_box_html($post)
302302
$type = "error_1";
303303
} else {
304304
$campaign = get_option('ha-campaign') ?? [];
305-
$nbCampaign = count($campaign);
305+
$nbCampaign = is_array($campaign) ? count($campaign) : 0;
306306
if (($nbCampaign == 0 or $campaign == '') && get_option('ha-error') == 0) {
307307
$pageWidget = "ha-no-campaign";
308308
$type = "error_2";
@@ -367,7 +367,7 @@ class="st38" />
367367
<a href="<?= esc_url(admin_url()); ?>admin.php?page=hello-asso">Synchronisation</a>
368368
<?php
369369
$campaign = get_option('ha-campaign') ?? [];
370-
$nbCampaign = count($campaign);
370+
$nbCampaign = is_array($campaign) ? count($campaign) : 0;
371371

372372
if (get_option('ha-slug') == '') {
373373
$pageWidget = "ha-no-sync";

hello-asso.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Plugin Name: HelloAsso
1717
* Plugin URI: https://centredaide.helloasso.com/s/article/paiement-en-ligne-wordpress-integrer-vos-campagnes-helloasso
1818
* Description: HelloAsso est la solution gratuite des associations pour collecter des paiements et des dons sur internet.
19-
* Version: 1.1.19
19+
* Version: 1.1.20
2020
* Author: HelloAsso
2121
* Author URI: https://helloasso.com
2222
* License: GPL-2.0+
@@ -36,7 +36,7 @@
3636
* Start at version 1.0.0 and use SemVer - https://semver.org
3737
* Rename this for your plugin and update it as you release new versions.
3838
*/
39-
define('HELLO_ASSO_VERSION', '1.1.19');
39+
define('HELLO_ASSO_VERSION', '1.1.20');
4040

4141
/**
4242
* The code that runs during plugin activation.

0 commit comments

Comments
 (0)