Merge pull request #86 from XjSv/develop

Hotfix v1.9.2
XjSv · Dec 30, 2024 · 823eba3 · 823eba3
2 parents 8c3c780 + aa269eb
commit 823eba3
Show file tree

Hide file tree

Showing 13 changed files with 198 additions and 195 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -6,7 +6,7 @@ authors:
     given-names: Justin
   - family-names: Tresova
     given-names: Armand
-version: 1.9.1
+version: 1.9.2
 doi: 10.5281/zenodo.1171250
 date-released: 2017-05-08
 url: "https://github.com/XjSv/cooked"
diff --git a/SECURITY.md b/SECURITY.md
@@ -5,7 +5,9 @@ Versions that are currently being supported with security updates.
 
 | Version     | Supported          |
 | -------     | ------------------ |
-| 1.9.0       | :white_check_mark: |
+| 1.9.2       | :white_check_mark: |
+| 1.9.1       | :x:                |
+| 1.9.0       | :x:                |
 | 1.8.9       | :x:                |
 | 1.8.8       | :x:                |
 | 1.8.7       | :x:                |

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "recipe"
     ],
     "homepage": "https://wordpress.org/plugins/cooked/",
-    "version": "1.9.1",
+    "version": "1.9.2",
     "type": "wordpress-plugin",
     "license": "GPL-3.0-or-later",
     "prefer-stable": true,

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

diff --git a/includes/class.cooked-admin-enqueues.php b/includes/class.cooked-admin-enqueues.php
@@ -148,14 +148,7 @@ public function admin_enqueues( $hook ) {
                     /* translators: confirmation for migrating all ### recipes, where ### displays the total number for the migration. */
                     'i18n_confirm_migrate_recipes' => sprintf(__('Please confirm that you are ready to migrate all %s recipes.', 'cooked'), number_format($total_old_recipes)),
                     'i18n_confirm_import_recipes' => __('Please confirm that you are ready to import all recipes.', 'cooked'),
-                    'permalink_structure' => get_option('permalink_structure'),
                     'wp_editor_roles_allowed' => esc_attr($wp_editor_roles_allowed),
-                    'browse_recipes_slug' => !isset($_cooked_settings['browse_recipes_slug']) ? 'browse-recipes' : $_cooked_settings['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'],
-                    'recipe_cuisine_slug' => !isset($_cooked_settings['recipe_cuisine_permalink']) ? 'cuisine' : $_cooked_settings['recipe_cuisine_permalink'],
-                    'recipe_tags_slug' => !isset($_cooked_settings['recipe_tag_permalink']) ? 'recipe-tag' : $_cooked_settings['recipe_tag_permalink'],
-                    'recipe_diet_slug' => !isset($_cooked_settings['recipe_diet_permalink']) ? 'diet' : $_cooked_settings['recipe_diet_permalink'],
                 ];
 
                 // Cooked Admin Style Assets

diff --git a/includes/class.cooked-enqueues.php b/includes/class.cooked-enqueues.php
@@ -29,12 +29,16 @@ function __construct() {
     public function enqueues($hook) {
         global $_cooked_settings;
 
+        $browse_page_id = !empty($_cooked_settings['browse_page']) ? $_cooked_settings['browse_page'] : false;
+        $browse_page = get_post($browse_page_id);
+        $browse_recipes_slug = !empty($browse_page) ? $browse_page->post_name : '';
+
         $cooked_js_vars = [
             'ajax_url' => admin_url('admin-ajax.php'),
             'timer_sound' => apply_filters('cooked_timer_sound_mp3', COOKED_URL . 'assets/audio/ding.mp3'),
             'i18n_timer' => __('Timer', 'cooked'),
             'permalink_structure' => get_option('permalink_structure'),
-            'browse_recipes_slug' => !isset($_cooked_settings['browse_recipes_slug']) ? 'browse-recipes' : $_cooked_settings['browse_recipes_slug'],
+            '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'],
             'recipe_cuisine_slug' => !isset($_cooked_settings['recipe_cuisine_permalink']) ? 'cuisine' : $_cooked_settings['recipe_cuisine_permalink'],

diff --git a/includes/class.cooked-settings.php b/includes/class.cooked-settings.php
@@ -112,6 +112,7 @@ private static function needs_rewrite_flush( $old_version ) {
         $versions_requiring_flush = [
             '1.9.0',  // New rewrite rules for Browse page introduced.
             '1.9.1',  // Hotfix for the permalink structure.
+            '1.9.2',  // Hotfix for the permalink structure.
         ];
 
         // If old version is newer than our latest flush requirement, no flush needed