CF7 version column to submission page, faster GTM timeout, drag and d…

…rop fix, update service warning removed from multisite
chrisblakley · Mar 14, 2024 · 94d76b7 · 94d76b7
1 parent 744c98c
commit 94d76b7
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 18 deletions.
diff --git a/.github/package.json b/.github/package.json
@@ -2,7 +2,7 @@
 	"name": "nebula-wp",
 	"title": "Nebula",
 	"description": "Advanced Starter WordPress Theme for Developers",
-	"version": "11.10.6.464",
+	"version": "11.10.14.451",
 	"homepage": "https://gearside.com/nebula/",
 	"repository": {
 		"type": "git",

diff --git a/Nebula-Child/assets/css/admin.css b/Nebula-Child/assets/css/admin.css
diff --git a/Nebula-Child/resources/sw.js b/Nebula-Child/resources/sw.js
@@ -1,6 +1,6 @@
 //BEGIN automated edits. These will be automatically overwritten.
 const THEME_NAME = 'nebula-child';
-const NEBULA_VERSION = 'v11.10.6.464'; //Wednesday, March 6, 2024 11:07:32 AM
+const NEBULA_VERSION = 'v11.10.14.451'; //Thursday, March 14, 2024 10:49:30 AM
 const OFFLINE_URL = 'https://nebula.gearside.com/offline/';
 const OFFLINE_IMG = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/offline.svg';
 const META_ICON = 'https://nebula.gearside.com/wp-content/themes/Nebula-main/assets/img/meta/android-chrome-512x512.png';

diff --git a/Nebula-Child/style.css b/Nebula-Child/style.css
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/critical.css b/assets/css/critical.css
diff --git a/assets/css/login.css b/assets/css/login.css
diff --git a/assets/css/pre.css b/assets/css/pre.css
diff --git a/assets/js/modules/helpers.js b/assets/js/modules/helpers.js
@@ -146,7 +146,7 @@ nebula.dragDropUpload = async function(){
 
 			//Drag out
 			dropArea.addEventListener('dragleave', function(e){
-				jQuery(dropArea).addClass('dragover');
+				jQuery(dropArea).removeClass('dragover');
 
 				thisEvent.event_name = 'file_upload_dragleave';
 				thisEvent.event_action = 'Drag Leave';

diff --git a/assets/scss/style.scss b/assets/scss/style.scss
@@ -3,7 +3,7 @@
 	Theme URI: https://nebula.gearside.com
 	Description: Nebula is a springboard WordPress theme framework for developers. Like other WordPress startup themes, it has custom functionality built-in (like shortcodes, styles, and JS/PHP functions), but unlike other themes Nebula is not meant for the end-user.
 	Author: Nebula
-	Version: 11.10.6.464
+	Version: 11.10.14.451
 	License: GNU General Public License v2.0 or later
 	License URI: http://www.gnu.org/licenses/gpl-2.0.html
 	Text Domain: nebula

diff --git a/inc/analytics.php b/inc/analytics.php
@@ -260,8 +260,8 @@ function gtag(){}; //No GA in Nebula
 			'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
 			})(window,document,'script','dataLayer','<?php echo nebula()->get_option('gtm_id'); ?>');
 
-		<?php if ( nebula()->get_option('ga_measurement_id') ): ?>
-			}, 1000);
+		<?php if ( nebula()->get_option('ga_measurement_id') ): //100ms and 250ms seem to work here, but currently 500ms to be safe ?>
+			}, 500);
 		<?php endif; ?>
 	</script>
 <?php endif; ?>

diff --git a/inc/data/nebula_theme.json b/inc/data/nebula_theme.json
@@ -1,5 +1,5 @@
 {
-	"version": "11.10.6.464",
+	"version": "11.10.14.451",
 	"details_url": "https://github.com/chrisblakley/Nebula/commits/main",
 	"download_url": "https://github.com/chrisblakley/Nebula/archive/main.zip"
 	}
diff --git a/libs/Admin/Admin.php b/libs/Admin/Admin.php
@@ -1564,6 +1564,7 @@ public function cf7_submissions_columns_head($columns){
 				}
 
 				$columns['notes'] = 'Internal Notes';
+				$columns['cf7_version'] = 'CF7 Version';
 
 				unset($columns['date']); //Replacing the WP date column with our own
 				unset($columns['id']); //This ID is confusing since it is the submission ID
@@ -1623,6 +1624,10 @@ public function cf7_submissions_columns_content($column_name, $submission_id){
 					echo '<span>' . get_post_meta($submission_id, 'nebula_cf7_submission_notes', true) . '</span>';
 				}
 
+				if ( $column_name === 'cf7_version' ){
+					echo '<span>' . json_decode($submission_data->post_content)->_wpcf7_version . '</span>';
+				}
+
 				echo '';
 			}
 		}

diff --git a/libs/Functions.php b/libs/Functions.php
@@ -3234,8 +3234,11 @@ public function cf7_debug_info($cf7_instance){
 				return array();
 			}
 
+			global $wp_version;
+
 			$debug_info = array();
 
+			$debug_info['wp_core_version'] = $wp_version;
 			$debug_info['nebula_timestamp'] = date('U');
 			$debug_info['nebula_date_formatted'] = date('l, F j, Y \a\t g:ia');
 			$debug_info['nebula_version'] = $this->version('full') . ' (Committed ' . $this->version('date') . ')';

diff --git a/libs/Utilities/Warnings.php b/libs/Utilities/Warnings.php
@@ -196,7 +196,7 @@ public function check_warnings(){
 					}
 
 					//If not pinging additional update services (blog must be public for this to be available)
-					if ( $this->is_warning_level('verbose') ){
+					if ( !is_multisite() && $this->is_warning_level('verbose') ){ //This option isunavailable on Multisite installs of WP
 						$ping_sites = get_option('ping_sites');
 						if ( $ping_sites === 'http://rpc.pingomatic.com/' ){ //If it only has the default value (ignore empty value if that is done intentionally)
 							$nebula_warnings['update_services'] = array(