From 747e235582b0d26383e3c01521dd1548bd68e417 Mon Sep 17 00:00:00 2001
From: Cyrill Bolliger <mail@cyrill.me>
Date: Tue, 7 Feb 2023 18:07:24 +0100
Subject: [PATCH 1/2] [FIX] incorrect redirection of multi-category urls

---
 .../themes/les-verts/lib/_loader.php          |  1 +
 .../lib/tweaks/fix-multi-category-urls.php    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 wordpress/wp-content/themes/les-verts/lib/tweaks/fix-multi-category-urls.php

diff --git a/wordpress/wp-content/themes/les-verts/lib/_loader.php b/wordpress/wp-content/themes/les-verts/lib/_loader.php
index 66144e1a..25926365 100644
--- a/wordpress/wp-content/themes/les-verts/lib/_loader.php
+++ b/wordpress/wp-content/themes/les-verts/lib/_loader.php
@@ -187,6 +187,7 @@
 
 require_once __DIR__ . '/tweaks/inject-svg-sprite.php';
 require_once __DIR__ . '/tweaks/responsive-local-video.php';
+require_once __DIR__ . '/tweaks/fix-multi-category-urls.php';
 
 if ( defined( 'WPSEO_FILE' ) ) {
 	require_once __DIR__ . '/tweaks/tweak-yoast-social-media-stuff.php';
diff --git a/wordpress/wp-content/themes/les-verts/lib/tweaks/fix-multi-category-urls.php b/wordpress/wp-content/themes/les-verts/lib/tweaks/fix-multi-category-urls.php
new file mode 100644
index 00000000..e8a4011d
--- /dev/null
+++ b/wordpress/wp-content/themes/les-verts/lib/tweaks/fix-multi-category-urls.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Fix multi-category urls
+ *
+ * Links to an archive of multiple categories with an AND conjunction are not
+ * correctly converted to pretty permalinks (e.g. /?category_name=cat1+cat2 is
+ * converted to /category/cat1/ instead of /category/cat1+cat2/). We therefore
+ * disable the pretty permalink conversion for category_name queries if they
+ * contain an AND conjunction.
+ */
+add_filter( 'redirect_canonical', function ( $redirect_url, $requested_url ) {
+	$query = parse_url( $requested_url, PHP_URL_QUERY );
+	if ( empty( $query ) || strpos( $query, 'category_name=' ) === false ) {
+		return $redirect_url;
+	}
+
+	parse_str( $query, $query_vars );
+	if ( empty( $query_vars['category_name'] ) ) {
+		return $redirect_url;
+	}
+
+	$query_vars['category_name'] = str_replace( ' ', '+', $query_vars['category_name'] );
+
+	if ( strpos( $query_vars['category_name'], '+' ) === false ) {
+		return $redirect_url;
+	}
+
+	return $requested_url;
+}, 10, 2 );

From bf3a066f72e10eaf1a99c1f1fdde4455519b5905 Mon Sep 17 00:00:00 2001
From: Cyrill Bolliger <mail@cyrill.me>
Date: Tue, 7 Feb 2023 18:08:39 +0100
Subject: [PATCH 2/2] [FIX] new version number

---
 wordpress/wp-content/themes/les-verts/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wordpress/wp-content/themes/les-verts/style.css b/wordpress/wp-content/themes/les-verts/style.css
index 3c31c475..d2624a8e 100644
--- a/wordpress/wp-content/themes/les-verts/style.css
+++ b/wordpress/wp-content/themes/les-verts/style.css
@@ -2,7 +2,7 @@
  * Theme Name: Les Verts
  * Description: Custom theme for the GREENS of Switzerland. Designed by superhuit.ch, built by gruene.ch on top of superhuit's stack.
  * Author: superhuit.ch & gruene.ch
- * Version: 0.35.0
+ * Version: 0.35.1
  * Requires PHP: 7.4
  * Requires at least: 5.0
  * Theme URI: https://github.com/grueneschweiz/2018.gruene.ch/