Skip to content

Commit dd3edf9

Browse files
authored
Merge pull request #479 from ProgressPlanner/develop
v1.4.1
2 parents a68e163 + 7d615e4 commit dd3edf9

4 files changed

Lines changed: 20 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
= 1.4.1 =
2+
3+
Bugs we fixed:
4+
5+
* Fixed a conflict with the premium version of Yoast SEO.
6+
17
= 1.4.0 =
28

39
Enhancements:

classes/suggested-tasks/providers/integrations/yoast/class-add-yoast-providers.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Add_Yoast_Providers {
1515
/**
1616
* Providers.
1717
*
18-
* @var array
18+
* @var (\Progress_Planner\Suggested_Tasks\Providers\Integrations\Yoast\Yoast_Provider|\Progress_Planner\Suggested_Tasks\Providers\Tasks)[]
1919
*/
2020
protected $providers = [];
2121

@@ -48,10 +48,12 @@ public function enqueue_assets( $hook ) {
4848

4949
// Add Ravi icon if the task is pending or is completed.
5050
if ( $provider->is_task_relevant() || \progress_planner()->get_suggested_tasks()->was_task_completed( $provider->get_task_id() ) ) {
51-
$focus_task = $provider->get_focus_tasks();
51+
if ( method_exists( $provider, 'get_focus_tasks' ) ) {
52+
$focus_task = $provider->get_focus_tasks();
5253

53-
if ( $focus_task ) {
54-
$focus_tasks = array_merge( $focus_tasks, $focus_task );
54+
if ( $focus_task ) {
55+
$focus_tasks = array_merge( $focus_tasks, $focus_task );
56+
}
5557
}
5658
}
5759
}

progress-planner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Description: A plugin to help you fight procrastination and get things done.
1010
* Requires at least: 6.3
1111
* Requires PHP: 7.4
12-
* Version: 1.4.0
12+
* Version: 1.4.1
1313
* Author: Team Emilia Projects
1414
* Author URI: https://prpl.fyi/about
1515
* License: GPL-3.0+

readme.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: planning, maintenance, writing, blogging
44
Requires at least: 6.3
55
Tested up to: 6.8
66
Requires PHP: 7.4
7-
Stable tag: 1.4.0
7+
Stable tag: 1.4.1
88
License: GPL3+
99
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
1010

@@ -110,6 +110,12 @@ https://youtu.be/e1bmxZYyXFY
110110

111111
== Changelog ==
112112

113+
= 1.4.1 =
114+
115+
Bugs we fixed:
116+
117+
* Fixed a conflict with the premium version of Yoast SEO.
118+
113119
= 1.4.0 =
114120

115121
Enhancements:

0 commit comments

Comments
 (0)