Merge pull request #108 from oceanwp/rc-2.4.1

Rc 2.4.1
oceanwp · Oct 22, 2024 · a0d892c · a0d892c
2 parents b02358f + 106d32b
commit a0d892c
Show file tree

Hide file tree

Showing 12 changed files with 190 additions and 144 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -63,7 +63,6 @@ module.exports = function (grunt) {
             prod: {
                 files: {
                     "assets/css/admin.min.css": "assets/css/admin.css",
-                    "assets/css/pluginUpdateMessage.min.css": "assets/css/pluginUpdateMessage.css",
                     "includes/menu-icons/css/admin.min.css": "includes/menu-icons/css/admin.css",
                     "includes/panel/assets/css/import-export.min.css": "includes/panel/assets/css/import-export.css",
                     "includes/panel/assets/css/demos.min.css": "includes/panel/assets/css/demos.css",

diff --git a/assets/css/pluginUpdateMessage.min.css b/assets/css/pluginUpdateMessage.min.css
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,10 @@
 == Changelog ==
 
+= 2.4.1 - OCT 21 2024 =
+- Fixed: OceanWP Metabox Settings: Logo: Customizer logo doesn't get overridden on individual level (main Customizer logo always displayed).
+- Fixed: OceanWP Customizer: General Options tab not displayed with OceanWP version 3.6.1 and lower.
+- Fixed: Plugin Update Notice: Breaking layout display in the plugins area on multisite.
+
 = 2.4.0 - OCT 16 2024 =
 - NEW: Customizer: Library upgraded to default WordPress ReactJS.
 - NEW: Customizer: User Interface.

diff --git a/composer.lock b/composer.lock
diff --git a/includes/compatibility/ocean.php b/includes/compatibility/ocean.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * OceanWP theme local Google fonts functionality
+ *
+ * @package OceanWP WordPress theme
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Control Preload google fonts.
@@ -106,7 +115,6 @@ function oceanwp_local_elementor_webfonts_enqueue( $src, $handle ) {
 	}
 }
 
-
 /**
  * Enqueues Local Google Font
  */
@@ -180,7 +188,6 @@ function oceanwp_webfonts_enqueue( $src, $font_name ) {
 	}
 }
 
-
 /**
  * Get Google Font CSS
  */

diff --git a/includes/panel/theme-panel.php b/includes/panel/theme-panel.php
@@ -147,46 +147,59 @@ public static function sticky_notice_css( $hook ) {
 	 */
 	private static function get_panels() {
 
-		$panels = array(
-			'oe_styles_and_settings_panel'        => array(
+		$theme = wp_get_theme();
+		$version = $theme->get( 'Version' );
+
+		$panels = array();
+
+		if ( version_compare( $version, '4.0.0', '>' ) ) {
+			$panels['oe_styles_and_settings_panel'] = array(
 				'label' => esc_html__( 'Site Style & Settings Panel', 'ocean-extra' ),
-			),
-			'oe_colors_panel'        => array(
+			);
+			$panels['oe_colors_panel'] = array(
 				'label' => esc_html__( 'Colors Panel', 'ocean-extra' ),
-			),
-			'oe_site_page_settings_panel'        => array(
+			);
+			$panels['oe_site_page_settings_panel'] = array(
 				'label' => esc_html__( 'Site Page Settings Panel', 'ocean-extra' ),
-			),
-			'oe_typography_panel'     => array(
-				'label' => esc_html__( 'Typography Panel', 'ocean-extra' ),
-			),
-			'oe_topbar_panel'         => array(
-				'label' => esc_html__( 'Top Bar Panel', 'ocean-extra' ),
-			),
-			'oe_header_panel'         => array(
-				'label' => esc_html__( 'Header Panel', 'ocean-extra' ),
-			),
-			'oe_site_performance_panel'        => array(
+			);
+			$panels['oe_site_performance_panel'] = array(
 				'label' => esc_html__( 'Site Performance Panel', 'ocean-extra' ),
-			),
-			'oe_seo_settings_panel'        => array(
+			);
+			$panels['oe_seo_settings_panel'] = array(
 				'label' => esc_html__( 'SEO Panel', 'ocean-extra' ),
-			),
-			'oe_blog_panel'           => array(
-				'label' => esc_html__( 'Blog Panel', 'ocean-extra' ),
-			),
-			'oe_sidebar_panel'        => array(
-				'label' => esc_html__( 'Sidebar Panel', 'ocean-extra' ),
-			),
-			'oe_footer_widgets_panel' => array(
-				'label' => esc_html__( 'Footer Widgets Panel', 'ocean-extra' ),
-			),
-			'oe_footer_bottom_panel'  => array(
-				'label' => esc_html__( 'Footer Bottom Panel', 'ocean-extra' ),
-			),
-			'oe_custom_code_panel'    => array(
-				'label' => esc_html__( 'Custom CSS/JS Panel', 'ocean-extra' ),
-			),
+			);
+		}
+
+		if ( version_compare( $version, '4.0.0', '<' ) ) {
+			$panels['oe_general_panel'] = array(
+				'label' => esc_html__( 'General Panel', 'ocean-extra' ),
+			);
+		}
+
+		// Panels that are included regardless of the theme version
+		$panels['oe_typography_panel'] = array(
+			'label' => esc_html__( 'Typography Panel', 'ocean-extra' ),
+		);
+		$panels['oe_topbar_panel'] = array(
+			'label' => esc_html__( 'Top Bar Panel', 'ocean-extra' ),
+		);
+		$panels['oe_header_panel'] = array(
+			'label' => esc_html__( 'Header Panel', 'ocean-extra' ),
+		);
+		$panels['oe_blog_panel'] = array(
+			'label' => esc_html__( 'Blog Panel', 'ocean-extra' ),
+		);
+		$panels['oe_sidebar_panel'] = array(
+			'label' => esc_html__( 'Sidebar Panel', 'ocean-extra' ),
+		);
+		$panels['oe_footer_widgets_panel'] = array(
+			'label' => esc_html__( 'Footer Widgets Panel', 'ocean-extra' ),
+		);
+		$panels['oe_footer_bottom_panel'] = array(
+			'label' => esc_html__( 'Footer Bottom Panel', 'ocean-extra' ),
+		);
+		$panels['oe_custom_code_panel'] = array(
+			'label' => esc_html__( 'Custom CSS/JS Panel', 'ocean-extra' ),
 		);
 
 		// Apply filters and return
@@ -275,7 +288,6 @@ public static function get_default_settings() {
 		return apply_filters( 'oe_default_panels', $default );
 	}
 
-
 }
 
 new Ocean_Extra_Theme_Panel();
diff --git a/includes/post-settings/apply-settings.php b/includes/post-settings/apply-settings.php
@@ -81,7 +81,7 @@ public function __construct() {
 			add_filter( 'ocean_custom_header_template', array( $this, 'custom_header_template' ) );
 
 			// Custom logo.
-			//add_filter( 'get_custom_logo', array( $this, 'custom_logo' ) );
+			add_filter( 'get_custom_logo', array( $this, 'custom_logo' ) );
 
 			// getustom logo ID for the retina function.
 			add_filter( 'ocean_custom_logo', array( $this, 'custom_logo_id' ) );

diff --git a/includes/themepanel/theme-panel.php b/includes/themepanel/theme-panel.php
@@ -498,46 +498,59 @@ private static function validate_panels( $settings ) {
 	 * Return customizer panels
 	 */
 	public static function get_panels() {
-		$panels = array(
-			'oe_styles_and_settings_panel'        => array(
+		$theme = wp_get_theme();
+		$version = $theme->get( 'Version' );
+
+		$panels = array();
+
+		if ( version_compare( $version, '4.0.0', '>' ) ) {
+			$panels['oe_styles_and_settings_panel'] = array(
 				'label' => esc_html__( 'Site Style & Settings Panel', 'ocean-extra' ),
-			),
-			'oe_colors_panel'        => array(
+			);
+			$panels['oe_colors_panel'] = array(
 				'label' => esc_html__( 'Colors Panel', 'ocean-extra' ),
-			),
-			'oe_site_page_settings_panel'        => array(
+			);
+			$panels['oe_site_page_settings_panel'] = array(
 				'label' => esc_html__( 'Site Page Settings Panel', 'ocean-extra' ),
-			),
-			'oe_typography_panel'     => array(
-				'label' => esc_html__( 'Typography Panel', 'ocean-extra' ),
-			),
-			'oe_topbar_panel'         => array(
-				'label' => esc_html__( 'Top Bar Panel', 'ocean-extra' ),
-			),
-			'oe_header_panel'         => array(
-				'label' => esc_html__( 'Header Panel', 'ocean-extra' ),
-			),
-			'oe_site_performance_panel'        => array(
+			);
+			$panels['oe_site_performance_panel'] = array(
 				'label' => esc_html__( 'Site Performance Panel', 'ocean-extra' ),
-			),
-			'oe_seo_settings_panel'        => array(
+			);
+			$panels['oe_seo_settings_panel'] = array(
 				'label' => esc_html__( 'SEO Panel', 'ocean-extra' ),
-			),
-			'oe_blog_panel'           => array(
-				'label' => esc_html__( 'Blog Panel', 'ocean-extra' ),
-			),
-			'oe_sidebar_panel'        => array(
-				'label' => esc_html__( 'Sidebar Panel', 'ocean-extra' ),
-			),
-			'oe_footer_widgets_panel' => array(
-				'label' => esc_html__( 'Footer Widgets Panel', 'ocean-extra' ),
-			),
-			'oe_footer_bottom_panel'  => array(
-				'label' => esc_html__( 'Footer Bottom Panel', 'ocean-extra' ),
-			),
-			'oe_custom_code_panel'    => array(
-				'label' => esc_html__( 'Custom CSS/JS Panel', 'ocean-extra' ),
-			),
+			);
+		}
+
+		if ( version_compare( $version, '4.0.0', '<' ) ) {
+			$panels['oe_general_panel'] = array(
+				'label' => esc_html__( 'General Panel', 'ocean-extra' ),
+			);
+		}
+
+		// Panels that are included regardless of the theme version
+		$panels['oe_typography_panel'] = array(
+			'label' => esc_html__( 'Typography Panel', 'ocean-extra' ),
+		);
+		$panels['oe_topbar_panel'] = array(
+			'label' => esc_html__( 'Top Bar Panel', 'ocean-extra' ),
+		);
+		$panels['oe_header_panel'] = array(
+			'label' => esc_html__( 'Header Panel', 'ocean-extra' ),
+		);
+		$panels['oe_blog_panel'] = array(
+			'label' => esc_html__( 'Blog Panel', 'ocean-extra' ),
+		);
+		$panels['oe_sidebar_panel'] = array(
+			'label' => esc_html__( 'Sidebar Panel', 'ocean-extra' ),
+		);
+		$panels['oe_footer_widgets_panel'] = array(
+			'label' => esc_html__( 'Footer Widgets Panel', 'ocean-extra' ),
+		);
+		$panels['oe_footer_bottom_panel'] = array(
+			'label' => esc_html__( 'Footer Bottom Panel', 'ocean-extra' ),
+		);
+		$panels['oe_custom_code_panel'] = array(
+			'label' => esc_html__( 'Custom CSS/JS Panel', 'ocean-extra' ),
 		);
 
 		// Apply filters and return

diff --git a/includes/update-message.php b/includes/update-message.php
@@ -21,7 +21,6 @@ class OE_Plugin_Update_Message {
 		public function __construct() {
 
 			add_action( 'in_plugin_update_message-ocean-extra/ocean-extra.php', array( $this, 'plugin_update_message' ), 10, 2 );
-			add_action( 'after_plugin_row_ocean-extra/ocean-extra.php', array( $this, 'ms_plugin_update_message' ), 10, 2 );
 			add_action( 'admin_enqueue_scripts', array( $this, 'plugin_update_asset' ) );
 		}
 
@@ -135,9 +134,9 @@ public function ms_plugin_update_message( $file, $plugin ) {
 		public function plugin_update_asset() {
 			$screen = get_current_screen();
 
-			if ( 'plugins' === $screen->id ) {
+			if ( 'plugins' === $screen->id || 'plugins-network' === $screen->id ) {
 				wp_enqueue_style(
-					'oss-plugin-update',
+					'oe-plugin-update',
 					plugins_url( '/assets/css/pluginUpdateMessage.min.css', __DIR__ ),
 					array(),
 					false