Merge branch 'develop' into ari/audit-2025-10

Author: aristath

assets/css/admin.css

@@ -306,7 +306,8 @@ button.prpl-info-icon {
 .prpl-wrap button.prpl-button-secondary,
 .prpl-wrap a.prpl-button-primary,
 .prpl-wrap a.prpl-button-secondary,
-#progress_planner_dashboard_widget_score a.prpl-button-primary { /* To be used in WP Dashboard widget */
+#progress_planner_dashboard_widget_score a.prpl-button-primary,
+#progress_planner_dashboard_widget_score a.prpl-button-secondary { /* To be used in WP Dashboard widget */
 	display: block;
 	margin: 1rem 0;
 	padding: 0.75rem 1.25rem;
@@ -360,13 +361,23 @@ button.prpl-info-icon {
 }
 
 .prpl-wrap input.prpl-button-secondary,
-.prpl-wrap button.prpl-button-secondary {
+.prpl-wrap button.prpl-button-secondary,
+.prpl-wrap a.prpl-button-secondary,
+#progress_planner_dashboard_widget_score a.prpl-button-secondary {
 	background: var(--prpl-color-selection-controls-inactive);
 
+	&::after {
+		background: var(--prpl-color-selection-controls-inactive);
+	}
+
 	&:not([disabled]):hover,
 	&:not([disabled]):focus {
 		background: var(--prpl-color-ui-icon);
 		box-shadow: 3px 3px 10px var(--prpl-color-ui-icon);
+
+		&::after {
+			background: var(--prpl-color-ui-icon);
+		}
 	}
 }
 

assets/css/page-widgets/latest-badge.css

@@ -58,7 +58,6 @@ public function get_widgets() {
 			\progress_planner()->get_admin__widgets__badge_streak_maintenance(),
 			\progress_planner()->get_admin__widgets__challenge(),
 			\progress_planner()->get_admin__widgets__activity_scores(),
-			\progress_planner()->get_admin__widgets__latest_badge(),
 			\progress_planner()->get_admin__widgets__content_activity(),
 			\progress_planner()->get_admin__widgets__whats_new(),
 		];

classes/admin/class-page.php

@@ -49,7 +49,6 @@
  * @method \Progress_Planner\Admin\Widgets\ToDo get_admin__widgets__todo()
  * @method \Progress_Planner\Admin\Widgets\Monthly_Badges get_admin__widgets__monthly_badges()
  * @method \Progress_Planner\UI\Popover get_ui__popover()
- * @method \Progress_Planner\Admin\Widgets\Latest_Badge get_admin__widgets__latest_badge()
  * @method \Progress_Planner\Admin\Widgets\Content_Activity get_admin__widgets__content_activity()
  * @method \Progress_Planner\UI\Chart get_ui__chart()
  * @method \Progress_Planner\Activities\Content_Helpers get_activities__content_helpers()

classes/admin/widgets/class-latest-badge.php

@@ -98,6 +98,18 @@ public function get_focus_tasks() {
 	 * @return bool
 	 */
 	public function should_add_task() {
+
+		// Check if the site logo is set, Yoast SEO uses it as a fallback.
+		$site_logo_id = \get_option( 'site_logo' );
+		if ( ! $site_logo_id ) {
+			$site_logo_id = \get_theme_mod( 'custom_logo', false );
+		}
+
+		// If the site logo is set, we don't need to add the task.
+		if ( (int) $site_logo_id ) {
+			return false;
+		}
+
 		// If the site is for a person, and the person logo is already set, we don't need to add the task.
 		if ( $this->yoast_seo->helpers->options->get( 'company_or_person', 'company' ) === 'company' // @phpstan-ignore-line property.nonObject
 			&& $this->yoast_seo->helpers->options->get( 'company_logo' ) // @phpstan-ignore-line property.nonObject

classes/class-base.php

@@ -30,7 +30,6 @@ class Deprecations {
 		'Progress_Planner\Widgets\Activity_Scores'         => [ 'Progress_Planner\Admin\Widgets\Activity_Scores', '1.1.1' ],
 		'Progress_Planner\Widgets\Badge_Streak'            => [ 'Progress_Planner\Admin\Widgets\Badge_Streak', '1.1.1' ],
 		'Progress_Planner\Widgets\Challenge'               => [ 'Progress_Planner\Admin\Widgets\Challenge', '1.1.1' ],
-		'Progress_Planner\Widgets\Latest_Badge'            => [ 'Progress_Planner\Admin\Widgets\Latest_Badge', '1.1.1' ],
 		'Progress_Planner\Widgets\Published_Content'       => [ 'Progress_Planner\Admin\Widgets\Published_Content', '1.1.1' ],
 		'Progress_Planner\Widgets\Todo'                    => [ 'Progress_Planner\Admin\Widgets\Todo', '1.1.1' ],
 		'Progress_Planner\Widgets\Whats_New'               => [ 'Progress_Planner\Admin\Widgets\Whats_New', '1.1.1' ],
@@ -103,7 +102,6 @@ class Deprecations {
 		'get_widgets__activity_scores'               => [ 'get_admin__widgets__activity_scores', '1.1.1' ],
 		'get_widgets__todo'                          => [ 'get_admin__widgets__todo', '1.1.1' ],
 		'get_widgets__challenge'                     => [ 'get_admin__widgets__challenge', '1.1.1' ],
-		'get_widgets__latest_badge'                  => [ 'get_admin__widgets__latest_badge', '1.1.1' ],
 		'get_widgets__badge_streak'                  => [ 'get_admin__widgets__badge_streak', '1.1.1' ],
 		'get_widgets__published_content'             => [ 'get_admin__widgets__published_content', '1.1.1' ],
 		'get_widgets__whats_new'                     => [ 'get_admin__widgets__whats_new', '1.1.1' ],

classes/suggested-tasks/providers/integrations/yoast/class-organization-logo.php

@@ -83,6 +83,12 @@ https://youtu.be/e1bmxZYyXFY
 
 == Changelog ==
 
+= 1.9.0 =
+
+Enhancements:
+
+* "Yoast SEO: set your organization logo" task detects site logo as fallback, same as Yoast SEO does.
+
 = 1.8.1 =
 
 - Security fix: Privilege escalation via an AJAX call where authenticated users could update arbitrary site options.

classes/utils/class-deprecations.php

@@ -66,5 +66,5 @@ class="prpl-input"
 			value="yes"
 		>
 	</div>
-	<button id="submit-license-key" class="button button-primary"><?php \esc_html_e( 'Subscribe', 'progress-planner' ); ?></button>
+	<button id="submit-license-key" class="prpl-button prpl-button-primary"><?php \esc_html_e( 'Subscribe', 'progress-planner' ); ?></button>
 </form>