fix merge

.bin/create-zip-file.sh

@@ -1,4 +1,4 @@
 
 
 rm -fr wordlift wordlift-*.zip ; cp -R src wordlift
-zip -r -9 wordlift-3.52.8.zip wordlift
+zip -r -9 wordlift-3.52.9.zip wordlift

.docker/wordpress/docker-entrypoint-init.d/10-wordpress-extra.sh

@@ -18,7 +18,7 @@ echo "** Set the rewrite structure **"
 wp --skip-plugins --skip-themes rewrite structure '/%postname%/'
 
 echo "** Installing and Activating plugins **"
-wp plugin install woocommerce wordpress-seo wp-recipe-maker query-monitor wp-crontrol --force --activate || true
+wp plugin install classic-editor woocommerce wordpress-seo wp-recipe-maker query-monitor wp-crontrol --force --activate || true
 
 echo "** Creating wladmin user **"
 # Check if the user exists

.github/workflows/publish-readme.sh

@@ -1,15 +1,20 @@
 #!/bin/bash
 
 get_version() {
-  grep -E '^ \* Version:\s+(\d+\.\d+\.\d+)$' src/wordlift.php | grep -oE '(\d+\.\d+\.\d+)$'
+  # This regex is crafted to work on ubuntu:22.04 which is the GH runner.
+  grep -P '^ \* Version:\s+(\d+\.\d+\.\d+)$' src/wordlift.php | grep -oP '(\d+\.\d+\.\d+)$'
 }
 
-if [[ 'src/readme.txt' == "$(git diff HEAD^ HEAD --name-only)" ]]; then
+if [[ 'src/readme.txt' == "$(git diff HEAD^ HEAD --name-only)" || "$GITHUB_EVENT_NAME" == "workflow_dispatch" ]]; then
   echo 'readme.txt has been updated, pushing...'
 
   version="$(get_version)"
+  echo "** Using version $version"
   sed -i "s|^Stable tag: .*$|Stable tag: $version|g" src/readme.txt
 
+  echo "** readme.txt new contents: "
+  cat src/readme.txt
+
   # Update readme.txt in trunk and stable version tag.
   # shellcheck disable=SC2086
   svnmucc -u $SVN_USERNAME -p $SVN_PASSWORD --non-interactive --trust-server-cert \

.github/workflows/publish-readme.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   wordpress:

src-js/webpack/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": "12"
   },
-  "version": "3.52.8",
+  "version": "3.52.9",
   "description": "WordLift Plugin application for the web site public front-end.",
   "main": "index.js",
   "repository": "https://github.com/insideout10/wordlift-plugin",

src/public/class-wordlift-term-jsonld-adapter.php

@@ -126,7 +126,7 @@ public function get_carousel_jsonld( $id = null ) {
 	private function get_posts( $id ) {
 		global $wp_query;
 
-		if ( $wp_query->posts !== null ) {
+		if ( is_array( $wp_query->posts ) ) {
 			return array_map(
 				function ( $post ) {
 					return $post->ID;

src/readme.txt

@@ -2,11 +2,11 @@
 Author URL: https://wordlift.io
 Plugin URL: https://wordlift.io
 Contributors: wordlift, insideout10, ziodave
-Tags: SEO, SERP, FAQ Markup, Schema Markup, structured data, schema.org, schema org, semantic seo, JSON-LD, artificial intelligence, ai, linked data, semantic web, content recommendation, related posts, timeline, knowledge graph, interactive map, classicpress
+Tags: SEO, structured data, ai, linked data, semantic web
 Requires at least: 5.3
-Tested up to: 6.5
+Tested up to: 6.6
 Requires PHP: 5.6
-Stable tag: 3.52.8
+Stable tag: 3.52.9
 License: GPLv2 or later
 
 Search engines are looking for meaning, not keywords. WordLift tells Google how your content relates to your brand, products, and stakeholders.
@@ -143,6 +143,10 @@ You can open your datasets to the public, attaching to it a free or a commercial
 
 == Changelog ==
 
+= 3.52.9 (2024-08-20) =
+
+* Some plugins appear to hijack the ``$wp_query->posts` so we do more sanity checks to prevent fatal errors 💪
+
 = 3.52.8 (2024-06-11) =
 
 * Fix [#1737](https://github.com/insideout10/wordlift-plugin/issues/1737): Fixed garbled text after Block Editor reported the wrong text length in combination with some themes