Merge pull request #1241 from Automattic/alpha

Release Nov 13

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [2.26.0-alpha.1](https://github.com/Automattic/newspack-popups/compare/v2.25.0...v2.26.0-alpha.1) (2023-10-31)
+
+
+### Features
+
+* segmentation criteria for subscriptions and memberships ([#1230](https://github.com/Automattic/newspack-popups/issues/1230)) ([bef21e0](https://github.com/Automattic/newspack-popups/commit/bef21e0babaf2590d28b75177e171397d68d4d4e))
+
 # [2.25.0](https://github.com/Automattic/newspack-popups/compare/v2.24.0...v2.25.0) (2023-10-31)
 
 

includes/class-newspack-popups-inserter.php

@@ -460,8 +460,14 @@ private static function is_memberships_restricted( $post_id = null ) {
 	 * @param string $content The content of the post.
 	 */
 	public static function insert_popups_in_content( $content = '' ) {
+		$post = get_post();
+
+		if ( ! $post ) {
+			return $content;
+		}
+
 		$filtered_content = explode( "\n", $content );
-		$post_content     = explode( "\n", get_post()->post_content );
+		$post_content     = explode( "\n", $post->post_content );
 		if (
 			// Avoid duplicate execution.
 			true === self::$the_content_has_rendered

newspack-popups.php

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-popups",
-  "version": "2.25.0",
+  "version": "2.26.0-alpha.1",
   "main": "Gruntfile.js",
   "author": "Automattic",
   "scripts": {
@@ -42,6 +42,6 @@
     "newspack-scripts": "^5.1.0",
     "postcss-scss": "^4.0.9",
     "prettier": "npm:wp-prettier@^2.2.1-beta-1",
-    "stylelint": "^15.10.3"
+    "stylelint": "^15.11.0"
   }
 }