Merge pull request #87 from XjSv/develop

Hotfix v1.9.3

CITATION.cff

@@ -6,7 +6,7 @@ authors:
     given-names: Justin
   - family-names: Tresova
     given-names: Armand
-version: 1.9.2
+version: 1.9.3
 doi: 10.5281/zenodo.1171250
 date-released: 2017-05-08
 url: "https://github.com/XjSv/cooked"

SECURITY.md

@@ -5,7 +5,8 @@ Versions that are currently being supported with security updates.
 
 | Version     | Supported          |
 | -------     | ------------------ |
-| 1.9.2       | :white_check_mark: |
+| 1.9.3       | :white_check_mark: |
+| 1.9.2       | :x:                |
 | 1.9.1       | :x:                |
 | 1.9.0       | :x:                |
 | 1.8.9       | :x:                |

assets/js/cooked-functions.js

@@ -153,10 +153,15 @@ var cooked_loading = false;
                     // Add sort segment
                     urlSegments.push(`sort/${encodeURIComponent(formValues.sort)}`);
 
-                    // Build and navigate to URL
-                    const prettyUrl = '/' + urlSegments.filter(Boolean).join('/');
+                    // Build URL
+                    const prettyUrl = urlSegments.filter(Boolean).join('/');
 
-                    window.location.href = prettyUrl;
+                    // Use WordPress site URL as base
+                    const siteUrl = new URL(cooked_js_vars.site_url);
+                    const finalUrl = `${siteUrl.pathname}/${prettyUrl}`.replace(/\/+/g, '/');
+
+                    // Navigate to URL
+                    window.location.href = finalUrl;
                 });
             }
         }

composer.json

@@ -6,7 +6,7 @@
         "recipe"
     ],
     "homepage": "https://wordpress.org/plugins/cooked/",
-    "version": "1.9.2",
+    "version": "1.9.3",
     "type": "wordpress-plugin",
     "license": "GPL-3.0-or-later",
     "prefer-stable": true,

cooked.php

@@ -6,7 +6,7 @@
 Description: 	A recipe plugin for WordPress.
 Author: 		Gora Tech
 Author URI: 	https://goratech.dev
-Version: 		1.9.2
+Version: 		1.9.3
 Text Domain: 	cooked
 Domain Path: 	languages
 License:     	GPL2
@@ -30,7 +30,7 @@
 
 require_once __DIR__ . '/vendor/autoload.php';
 
-define( 'COOKED_VERSION', '1.9.2' );
+define( 'COOKED_VERSION', '1.9.3' );
 define( 'COOKED_DEV', false );
 
 if ( ! class_exists( 'Cooked_Plugin' ) ) :

includes/class.cooked-enqueues.php

@@ -38,6 +38,7 @@ public function enqueues($hook) {
             'timer_sound' => apply_filters('cooked_timer_sound_mp3', COOKED_URL . 'assets/audio/ding.mp3'),
             'i18n_timer' => __('Timer', 'cooked'),
             'permalink_structure' => get_option('permalink_structure'),
+            'site_url' => get_site_url(),
             'browse_recipes_slug' => $browse_recipes_slug,
             'recipe_category_slug' => !isset($_cooked_settings['recipe_category_permalink']) ? 'recipe-category' : $_cooked_settings['recipe_category_permalink'],
             'recipe_cooking_method_slug' => !isset($_cooked_settings['recipe_cooking_method_permalink']) ? 'cooking-method' : $_cooked_settings['recipe_cooking_method_permalink'],

languages/cooked.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Cooked - Recipe Management 1.9.2\n"
+"Project-Id-Version: Cooked - Recipe Management 1.9.3\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/cooked\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-12-30T18:24:53-05:00\n"
+"POT-Creation-Date: 2024-12-30T19:21:07-05:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 "X-Domain: cooked\n"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cooked",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Cooked is the absolute best way to create & display recipes with WordPress. SEO optimized (rich snippets), galleries, cooking timers, printable recipes and much more.",
   "main": "index.js",
   "scripts": {

readme.txt

@@ -3,7 +3,7 @@ Contributors: xjsv, boxystudio
 Tags: recipe, recipes, food, cooking, nutrition
 Requires at least: 4.7
 Tested up to: 6.7.1
-Stable tag: 1.9.2
+Stable tag: 1.9.3
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -76,10 +76,13 @@ Be sure to check the [Cooked Documentation](https://github.com/XjSv/Cooked/wiki)
 
 == Upgrade Notice ==
 
-Version 1.9.2 includes a hotfix for the permalink structure that was introduced in version 1.9.0. Update is highly recommended!
+Version 1.9.3 includes a hotfix for the permalink structure that was introduced in version 1.9.0. Update is highly recommended!
 
 == Changelog ==
 
+= 1.9.3 =
+* **FIX:** Fixed issue with the permalink structure specifically for the Browse Recipe page.
+
 = 1.9.2 =
 * **FIX:** Fixed issue with the permalink structure specifically for the Browse Recipe page.
 

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'xjsv/cooked',
-        'pretty_version' => '1.9.1',
-        'version' => '1.9.1.0',
+        'pretty_version' => '1.9.3',
+        'version' => '1.9.3.0',
         'reference' => null,
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -20,8 +20,8 @@
             'dev_requirement' => false,
         ),
         'xjsv/cooked' => array(
-            'pretty_version' => '1.9.1',
-            'version' => '1.9.1.0',
+            'pretty_version' => '1.9.3',
+            'version' => '1.9.3.0',
             'reference' => null,
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',