Sync branch [skip ci]

CHANGELOG.md

@@ -1,3 +1,11 @@
+##### [Version 3.6.6](https://github.com/Codeinwp/neve/compare/v3.6.5...v3.6.6) (2023-08-03)
+
+- [Fix] Solve customizer permissions on multisite
+- [Fix] Add aria-label on the dropdown of the sidebar menu
+- [Fix] Incorrect author displayed on sticky posts with Feedzy Pro plugin
+- Introducing a new presentational tab dedicated to Otter within the About Us page of Neve Dashboard
+- Improve compatibility with WPML
+
 ##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17)
 
 - [Fix] Deprecated notice in HFG Footer

composer-dev.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "codeinwp/themeisle-sdk",
-            "version": "3.2.40",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeinwp/themeisle-sdk.git",
-                "reference": "d719fff89cb6643e555f5e3daa4ebd627ccb4fd7"
+                "reference": "b799403bec877749ee0a2916dc859366d62bd76c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/d719fff89cb6643e555f5e3daa4ebd627ccb4fd7",
-                "reference": "d719fff89cb6643e555f5e3daa4ebd627ccb4fd7",
+                "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/b799403bec877749ee0a2916dc859366d62bd76c",
+                "reference": "b799403bec877749ee0a2916dc859366d62bd76c",
                 "shasum": ""
             },
             "require-dev": {
@@ -42,9 +42,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeinwp/themeisle-sdk/issues",
-                "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.2.40"
+                "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.2"
             },
-            "time": "2023-03-30T09:29:30+00:00"
+            "time": "2023-08-02T13:04:20+00:00"
         },
         {
             "name": "wptt/webfont-loader",
@@ -989,5 +989,5 @@
     "platform-overrides": {
         "php": "7.2"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }

functions.php

@@ -8,7 +8,7 @@
  * @package Neve
  */
 
-define( 'NEVE_VERSION', '3.6.5' );
+define( 'NEVE_VERSION', '3.6.6' );
 define( 'NEVE_INC_DIR', trailingslashit( get_template_directory() ) . 'inc/' );
 define( 'NEVE_ASSETS_URL', trailingslashit( get_template_directory_uri() ) . 'assets/' );
 define( 'NEVE_MAIN_DIR', get_template_directory() . '/' );

inc/admin/dashboard/main.php

@@ -110,18 +110,16 @@ public function register_about_page() {
 		add_filter(
 			'neve_about_us_metadata',
 			function () use ( $filtered_name ) {
+
 				return [
 					// Top-level page in the dashboard sidebar
 					'location'         => 'neve-welcome',
 					// Logo to display on the page
 					'logo'             => get_template_directory_uri() . '/assets/img/dashboard/logo.svg',
-					// Menu displayed at the top of the page - optional
-					// 'page_menu'        => [
-					// [ 'text' => 'SDK GitHub Issues', 'url' => esc_url( 'https://github.com/codeinwp/themeisle-sdk/issues' ) ],
-					// [ 'text' => 'Themeisle', 'url' => esc_url( 'https://themeisle.com' ) ]
-					// ],
 					// Condition to show or hide the upgrade menu in the sidebar
 					'has_upgrade_menu' => ! defined( 'NEVE_PRO_VERSION' ),
+					// Add predefined product pages to the about page.
+					'product_pages'    => [ 'otter-page' ],
 					// Upgrade menu item link & text
 					'upgrade_link'     => tsdk_utmify( esc_url( 'https://themeisle.com/themes/neve/upgrade/' ), 'aboutfilter', 'nevedashboard' ),
 					'upgrade_text'     => __( 'Upgrade', 'neve' ) . ' ' . $filtered_name,
@@ -217,7 +215,7 @@ public function register() {
 			[ $this, 'render' ]
 		);
 
-		$this->copy_customizer_page( $theme_page, $capability );
+		$this->copy_customizer_page( $theme_page );
 
 		if ( ! defined( 'NEVE_PRO_VERSION' ) || 'valid' !== apply_filters( 'product_neve_license_status', false ) ) {
 			// Add Custom Layout submenu for upsell.
@@ -235,11 +233,10 @@ public function register() {
 	 * Copy the customizer page to the dashboard.
 	 *
 	 * @param string $theme_page The theme page slug.
-	 * @param string $capability The capability required to view the page.
 	 *
 	 * @return void
 	 */
-	private function copy_customizer_page( $theme_page, $capability ) {
+	private function copy_customizer_page( $theme_page ) {
 		global $submenu;
 		if ( ! isset( $submenu['themes.php'] ) ) {
 			return;
@@ -267,7 +264,7 @@ private function copy_customizer_page( $theme_page, $capability ) {
 			$theme_page,
 			$customizer_menu_item[0],
 			$customizer_menu_item[0],
-			$capability,
+			'manage_options',
 			'customize.php'
 		);
 	}

inc/views/nav_walker.php

@@ -151,7 +151,7 @@ public function add_caret( $title, $item, $args, $depth ) {
 				$expand_dropdowns = apply_filters( 'neve_first_level_expanded', false );
 				$additional_class = $expand_dropdowns && $depth === 0 ? 'dropdown-open' : '';
 
-				$caret  = '<button ' . $expanded . ' type="button" class="caret-wrap navbar-toggle ' . esc_attr( (string) $item->menu_order ) . ' ' . esc_attr( $additional_class ) . '" style="' . esc_attr( $caret_wrap_css ) . '">';
+				$caret  = '<button ' . $expanded . ' type="button" class="caret-wrap navbar-toggle ' . esc_attr( (string) $item->menu_order ) . ' ' . esc_attr( $additional_class ) . '" style="' . esc_attr( $caret_wrap_css ) . '"  aria-label="' . __( 'Toggle', 'neve' ) . ' ' . wp_filter_nohtml_kses( $title ) . '">';
 				$caret .= $caret_pictogram;
 				$caret .= '</button>';
 

inc/views/partials/post_meta.php

@@ -263,6 +263,11 @@ public static function neve_get_author_meta( $post_id = null, $show_before = tru
 		if ( ! isset( $current_post ) ) {
 			return false;
 		}
+		// we need to set the global post to the current post in order to allow other filters that hook into get_the_author_meta hooks access to the current post.
+		// we reset this at the end of the function.
+		$original_global_post = $post;
+		$post                 = $current_post; //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		setup_postdata( $current_post );
 
 		$author_id      = $current_post->post_author;
 		$user_nicename  = get_the_author_meta( 'user_nicename', $author_id );
@@ -312,6 +317,8 @@ public static function neve_get_author_meta( $post_id = null, $show_before = tru
 		 */
 		$markup = apply_filters( 'neve_filter_author_meta_markup', $markup, $post_id, $show_before );
 
+		$post = $original_global_post; //phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
+		wp_reset_postdata();
 		return wp_kses_post( $markup );
 	}
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "neve",
 	"nicename": "Neve",
-	"version": "3.6.5",
+	"version": "3.6.6",
 	"description": "Neve theme by ThemeIsle",
 	"category": "themes",
 	"author": "ThemeIsle <[email protected]>",

readme.md

@@ -2,7 +2,7 @@
 **Contributors:** [themeisle](https://profiles.wordpress.org/themeisle)  
 **Tags:** blog,block-patterns, custom-logo, e-commerce, rtl-language-support, grid-layout, one-column, two-columns, custom-background, custom-colors, custom-header, custom-menu, featured-image-header, featured-images, flexible-header, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, accessibility-ready, wide-blocks, block-styles, footer-widgets, portfolio, left-sidebar, right-sidebar  
 **Requires at least:** 4.0  
-**Tested up to:** 6.2  
+**Tested up to:** 6.3  
 **Stable tag:** trunk  
 **Requires PHP:** 7.0  
 **License:** GPLv2 or later  
@@ -19,6 +19,17 @@ Neve is distributed under the terms of the GNU GPLv2 or later
 
 ## Changelog ##
 
+##### [Version 3.6.6](https://github.com/Codeinwp/neve/compare/v3.6.5...v3.6.6) (2023-08-03)
+
+- [Fix] Solve customizer permissions on multisite
+- [Fix] Add aria-label on the dropdown of the sidebar menu
+- [Fix] Incorrect author displayed on sticky posts with Feedzy Pro plugin
+- Introducing a new presentational tab dedicated to Otter within the About Us page of Neve Dashboard
+- Improve compatibility with WPML
+
+
+
+
 ##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17)
 
 - [Fix] Deprecated notice in HFG Footer
@@ -71,7 +82,7 @@ Neve is distributed under the terms of the GNU GPLv2 or later
 
 - [Feat] Add relative CSS unit support for font size controls in the customizer
 - [Feat] Granular Heading Font Family Controls
-- [Feat] Manage top and bottom margins for pages and posts 
+- [Feat] Manage top and bottom margins for pages and posts
 - [Fix] Accessibility warning for the site title
 - [Fix] Hover Skin Mode not working for the Footer Menu
 - [Fix] Improve the accessibility of the mobile menu by adding an aria-expanded attribute

readme.txt

@@ -2,7 +2,7 @@
 Contributors: themeisle
 Tags: blog,block-patterns, custom-logo, e-commerce, rtl-language-support, grid-layout, one-column, two-columns, custom-background, custom-colors, custom-header, custom-menu, featured-image-header, featured-images, flexible-header, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, accessibility-ready, wide-blocks, block-styles, footer-widgets, portfolio, left-sidebar, right-sidebar
 Requires at least: 4.0
-Tested up to: 6.2
+Tested up to: 6.3
 Stable tag: trunk
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -19,6 +19,17 @@ Neve is distributed under the terms of the GNU GPLv2 or later
 
 == Changelog ==
 
+##### [Version 3.6.6](https://github.com/Codeinwp/neve/compare/v3.6.5...v3.6.6) (2023-08-03)
+
+- [Fix] Solve customizer permissions on multisite
+- [Fix] Add aria-label on the dropdown of the sidebar menu
+- [Fix] Incorrect author displayed on sticky posts with Feedzy Pro plugin
+- Introducing a new presentational tab dedicated to Otter within the About Us page of Neve Dashboard
+- Improve compatibility with WPML
+
+
+
+
 ##### [Version 3.6.5](https://github.com/Codeinwp/neve/compare/v3.6.4...v3.6.5) (2023-07-17)
 
 - [Fix] Deprecated notice in HFG Footer
@@ -71,7 +82,7 @@ Neve is distributed under the terms of the GNU GPLv2 or later
 
 - [Feat] Add relative CSS unit support for font size controls in the customizer
 - [Feat] Granular Heading Font Family Controls
-- [Feat] Manage top and bottom margins for pages and posts 
+- [Feat] Manage top and bottom margins for pages and posts
 - [Fix] Accessibility warning for the site title
 - [Fix] Hover Skin Mode not working for the Footer Menu
 - [Fix] Improve the accessibility of the mobile menu by adding an aria-expanded attribute

style.css

@@ -7,7 +7,7 @@ Tested up to:   6.2
 Requires PHP:   7.0
 Requires at least: 5.4
 Description:    Neve is a super fast, easily customizable, multi-purpose theme. It’s perfect for blogs, small business, startups, agencies, firms, e-commerce shops (WooCommerce storefront) as well as personal portfolio sites and most types of projects. A fully AMP optimized and responsive theme, Neve will load in mere seconds and adapt perfectly on any viewing device. While it is lightweight and has a minimalist design, the theme is highly extendable, it has a highly SEO optimized code, resulting in top rankings in Google search results. Neve works perfectly with Gutenberg and the most popular page builders (Elementor, Brizy, Beaver Builder, Visual Composer, SiteOrigin, Divi). Neve is also WooCommerce ready, responsive, RTL & translation ready. Look no further. Neve is the perfect theme for you!
-Version:        3.6.5
+Version:        3.6.6
 License:        GNU General Public License v2 or later
 License URI:    http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain:    neve

wpml-config.xml

@@ -14,6 +14,13 @@
       <key name="neve_sale_tag_text"/>
       <key name="neve_metadata_separator"/>
       <key name="neve_read_more_text"/>
+
+      <key name="neve_post_comment_section_title"/>
+      <key name="neve_post_comment_form_title"/>
+      <key name="neve_post_comment_form_button_text"/>
+      <key name="nav-icon_menu_label"/>
+      <key name="header_search_button_text"/>
+      <key name="header_palette_switch_placeholder"/>
     </key>
   </admin-texts>
-</wpml-config>
+</wpml-config>