← All changes
|
includes/admin/campaign-builder/fields/class-progress-bar.php
+7
-4
1.8.11
→
1.8.13
View file →
| @@ -149,19 +149,22 @@ | ||
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | // if the "show_goal" is set to "show_goal" then show the goal, otherise do not but hidding it by setting 'charitable-hidden' class. |
| 153 | + // A newly dragged-in field has neither 'show_hide' (legacy multi-check key) nor the | |
| 154 | + // newer 'show_donated'/'show_goal' scalars until it is first saved, so every key is | |
| 155 | + // checked with isset()/! empty() before use. | |
| 153 | 156 | $show_donated_css = ! empty( $field_data ) && |
| 154 | 157 | ( |
| 155 | - ( is_array( $field_data['show_hide'] ) && ! empty( $field_data['show_hide'] ) && in_array( 'show_donated', $field_data['show_hide'] ) ) || // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 156 | - ( is_string( $field_data['show_donated'] ) && 'show_donated' === $field_data['show_donated'] ) | |
| 158 | + ( ! empty( $field_data['show_hide'] ) && is_array( $field_data['show_hide'] ) && in_array( 'show_donated', $field_data['show_hide'] ) ) || // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 159 | + ( isset( $field_data['show_donated'] ) && is_string( $field_data['show_donated'] ) && 'show_donated' === $field_data['show_donated'] ) | |
| 157 | 160 | ) |
| 158 | 161 | ? '' : 'charitable-hidden'; |
| 159 | 162 | $show_goal_css = ! empty( $field_data ) && |
| 160 | 163 | |
| 161 | 164 | ( |
| 162 | - ( is_array( $field_data['show_hide'] ) && ! empty( $field_data['show_hide'] ) && in_array( 'show_goal', $field_data['show_hide'] ) ) || // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 163 | - ( is_string( $field_data['show_goal'] ) && 'show_goal' === $field_data['show_goal'] ) | |
| 165 | + ( ! empty( $field_data['show_hide'] ) && is_array( $field_data['show_hide'] ) && in_array( 'show_goal', $field_data['show_hide'] ) ) || // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict | |
| 166 | + ( isset( $field_data['show_goal'] ) && is_string( $field_data['show_goal'] ) && 'show_goal' === $field_data['show_goal'] ) | |
| 164 | 167 | ) |
| 165 | 168 | ? '' : 'charitable-hidden'; |
| 166 | 169 | |
| 167 | 170 | $progress_bar_css = $show_progress_bar ? '' : ' charitable-campaign-preview-not-available charitable-hidden'; |