Release Dec 16

includes/class-newspack-popups-model.php

@@ -91,7 +91,7 @@ public static function retrieve_active_popups() {
 	 * Set terms for a Popup.
 	 *
 	 * @param integer $id ID of Popup.
-	 * @param array   $terms Array of terms to be set.
+	 * @param array   $terms Array of term objects or IDs to be set.
 	 * @param string  $taxonomy Taxonomy slug.
 	 */
 	public static function set_popup_terms( $id, $terms, $taxonomy ) {
@@ -117,7 +117,11 @@ public static function set_popup_terms( $id, $terms, $taxonomy ) {
 			);
 		}
 		$term_ids = array_map(
-			function( $term ) {
+			function( $term ) use ( $taxonomy ) {
+				if ( is_int( $term ) ) {
+					$term       = get_term_by( 'id', $term, $taxonomy, ARRAY_A );
+					$term['id'] = $term['term_id'];
+				}
 				return $term['id'];
 			},
 			$terms

includes/class-newspack-popups.php

@@ -334,6 +334,9 @@ public static function register_meta() {
 				'single'            => true,
 				'auth_callback'     => '__return_true',
 				'sanitize_callback' => function( $input ) {
+					if ( empty( $input ) ) {
+						return '';
+					}
 					return preg_replace( '~[^-\w0-9_\s]+~', '', $input );
 				},
 			]
@@ -1252,6 +1255,14 @@ public static function duplicate_popup( $id, $title = '' ) {
 			);
 			wp_set_post_terms( $new_popup_id, $old_campaigns, self::NEWSPACK_POPUPS_TAXONOMY );
 
+			// Apply segment terms.
+			$old_segments = wp_get_post_terms(
+				$id,
+				Newspack_Segments_Model::TAX_SLUG,
+				[ 'fields' => 'ids' ]
+			);
+			wp_set_post_terms( $new_popup_id, $old_segments, Newspack_Segments_Model::TAX_SLUG );
+
 			// Set prompt options to match old prompt.
 			$old_popup_options = Newspack_Popups_Model::get_popup_options( $id );
 			foreach ( $old_popup_options as $key => $value ) {

newspack-popups.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com
  * Text Domain:     newspack-popups
  * Domain Path:     /languages
- * Version:         3.1.5
+ * Version:         3.1.6-alpha.1
  *
  * @package         Newspack_Popups
  */

package.json

@@ -39,7 +39,7 @@
 	},
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",
-		"@wordpress/browserslist-config": "^6.12.0",
+		"@wordpress/browserslist-config": "^6.13.0",
 		"eslint": "^8.57.0",
 		"lint-staged": "^15.2.10",
 		"newspack-scripts": "^5.5.2",

tests/test-e2e.php

@@ -46,9 +46,17 @@ public function test_e2e_duplicate_prompt() {
 				'slug'     => 'everyday',
 			]
 		);
-		wp_set_post_terms( $original_popup_id, [ $category_id ], 'category' );
-		wp_set_post_terms( $original_popup_id, [ $tag_id ], 'post_tag' );
-		wp_set_post_terms( $original_popup_id, [ $campaign_id ], Newspack_Popups::NEWSPACK_POPUPS_TAXONOMY );
+		$segment_id  = self::factory()->term->create(
+			[
+				'name'     => 'Loyal Readers',
+				'taxonomy' => Newspack_Segments_Model::TAX_SLUG,
+				'slug'     => 'loyal-readers',
+			]
+		);
+		Newspack_Popups_Model::set_popup_terms( $original_popup_id, [ $category_id ], 'category' );
+		Newspack_Popups_Model::set_popup_terms( $original_popup_id, [ $tag_id ], 'post_tag' );
+		Newspack_Popups_Model::set_popup_terms( $original_popup_id, [ $campaign_id ], Newspack_Popups::NEWSPACK_POPUPS_TAXONOMY );
+		Newspack_Popups_Model::set_popup_terms( $original_popup_id, [ $segment_id ], Newspack_Segments_Model::TAX_SLUG );
 
 		$duplicate_popup_id          = Newspack_Popups::duplicate_popup( $original_popup_id );
 		$second_duplicate_id         = Newspack_Popups::duplicate_popup( $duplicate_popup_id );
@@ -94,5 +102,11 @@ public function test_e2e_duplicate_prompt() {
 			Newspack_Popups_Model::get_popup_options( $duplicate_popup_id ),
 			'Duplicated prompt has the same prompt options as the original prompt.'
 		);
+
+		self::assertEquals(
+			Newspack_Popups_Model::get_popup_segments( $original_popup_id ),
+			Newspack_Popups_Model::get_popup_segments( $duplicate_popup_id ),
+			'Duplicate prompt has the same segments as the original prompt.'
+		);
 	}
 }