chore(release): merge in release v2.3.4

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.3.4](https://github.com/Automattic/newspack-network/compare/v2.3.3...v2.3.4) (2024-12-18)
+
+
+### Bug Fixes
+
+* Force Distributor to not override bylines ([#175](https://github.com/Automattic/newspack-network/issues/175)) ([efbc979](https://github.com/Automattic/newspack-network/commit/efbc9798cc7c13985e2a9a2e4920f485dbe8a11e))
+
 ## [2.3.3](https://github.com/Automattic/newspack-network/compare/v2.3.2...v2.3.3) (2024-12-16)
 
 

includes/class-distributor-customizations.php

@@ -27,5 +27,6 @@ public static function init() {
 		Distributor_Customizations\Author_Ingestion::init();
 		Distributor_Customizations\Authorship_Filters::init();
 		Distributor_Customizations\Comment_Status::init();
+		Distributor_Customizations\Force_Author_Byline::init();
 	}
 }

includes/distributor-customizations/class-force-author-byline.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Newspack Distributor Force Author byline option.
+ *
+ * @package Newspack
+ */
+
+namespace Newspack_Network\Distributor_Customizations;
+
+/**
+ * Class to enforce that the "Override Author Byline" option is always disabled.
+ */
+class Force_Author_Byline {
+
+	/**
+	 * Initialize hooks
+	 */
+	public static function init() {
+		add_filter( 'option_dt_settings', [ __CLASS__, 'filter_dt_settings' ] );
+		add_filter( 'default_option_dt_settings', [ __CLASS__, 'filter_dt_settings' ] );
+		add_action( 'admin_init', [ __CLASS__, 'remove_setting' ], 11 );
+	}
+
+	/**
+	 * Filter the Distributor settings to ensure that the "Override Author Byline" option is always disabled.
+	 *
+	 * @param array $settings The Distributor settings.
+	 */
+	public static function filter_dt_settings( $settings ) {
+		if ( ! is_array( $settings ) ) {
+			$settings = [];
+		}
+		$settings['override_author_byline'] = false;
+		return $settings;
+	}
+
+	/**
+	 * Remove the "Override Author Byline" setting from the Distributor settings page.
+	 */
+	public static function remove_setting() {
+		global $wp_settings_fields;
+
+		if (
+			isset( $wp_settings_fields['distributor'] ) &&
+			isset( $wp_settings_fields['distributor']['dt-section-1'] ) &&
+			isset( $wp_settings_fields['distributor']['dt-section-1']['override_author_byline'] )
+		) {
+			unset( $wp_settings_fields['distributor']['dt-section-1']['override_author_byline'] );
+		}
+	}
+}

newspack-network.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Newspack Network
  * Description: The Newspack Network plugin.
- * Version: 2.3.3
+ * Version: 2.3.4
  * Author: Automattic
  * Author URI: https://newspack.com/
  * License: GPL3

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-network",
-	"version": "2.3.3",
+	"version": "2.3.4",
 	"description": "The Newspack Network plugin.",
 	"license": "GPL-3.0",
 	"browserslist": [