diff --git a/.github/package.json b/.github/package.json index 0cad20ddc..50473b83a 100644 --- 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": "8.9.5", + "version": "8.9.32", "homepage": "https://gearside.com/nebula/", "repository": { "type": "git", diff --git a/assets/js/nebula.js b/assets/js/nebula.js index e245ecee8..51f75e509 100644 --- a/assets/js/nebula.js +++ b/assets/js/nebula.js @@ -283,7 +283,7 @@ nebula.registerServiceWorker = function(){ } else { //If the Service Worker option is disabled //Force unregister any existing SWs navigator.serviceWorker.getRegistrations().then(function(registrations){ - for ( let registration of registrations ){ + for ( var registration of registrations ){ registration.unregister(); } }); diff --git a/assets/scss/style.scss b/assets/scss/style.scss index caf157a32..e56b951e3 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -4,7 +4,7 @@ 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: Pinckney Hugo Group Author URI: http://www.pinckneyhugo.com - Version: 8.9.5.7626 + Version: 8.9.32.001 License: GNU General Public License v2.0 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: one-column, two-columns, three-columns, four-columns, left-sidebar, right-sidebar, threaded-comments, theme-options, sticky-post, post-formats, microformats, full-width-template, front-page-post-form, flexible-header, featured-images, featured-image-header, editor-style, custom-menu, custom-colors, accessibility-ready diff --git a/inc/data/nebula_theme.json b/inc/data/nebula_theme.json index c3d40a91a..e30b841e5 100644 --- a/inc/data/nebula_theme.json +++ b/inc/data/nebula_theme.json @@ -1,5 +1,5 @@ { - "version": "8.9.5.7625", + "version": "8.9.32.001", "details_url": "https://github.com/chrisblakley/Nebula/commits/main", "download_url": "https://github.com/chrisblakley/Nebula/archive/main.zip" } \ No newline at end of file diff --git a/libs/Admin/Admin.php b/libs/Admin/Admin.php index 973c0ca64..ceca69182 100644 --- a/libs/Admin/Admin.php +++ b/libs/Admin/Admin.php @@ -24,7 +24,7 @@ public function hooks(){ add_filter('nebula_brain', array($this, 'admin_brain')); add_action('save_post', array($this, 'clear_transients')); add_action('profile_update', array($this, 'clear_transients')); - add_action('upgrader_process_complete', array($this, 'theme_update_automation'), 10, 2); //Action 'upgrader_post_install' also exists. + //add_action('upgrader_process_complete', array($this, 'theme_update_automation'), 10, 2); //Action 'upgrader_post_install' also exists. add_filter('auth_cookie_expiration', array($this, 'session_expire')); add_action('after_setup_theme', array($this, 'custom_media_display_settings')); @@ -43,8 +43,8 @@ public function hooks(){ if ( current_user_can('edit_others_posts') ){ add_action('admin_init', array($this, 'theme_json')); - add_filter('puc_request_update_result_theme-Nebula', array($this, 'theme_update_version_store'), 10, 2); //This hook is found in UpdateChecker.php in the filterUpdateResult() function. - add_filter('site_transient_update_themes', array($this, 'force_nebula_theme_update'), 99, 1); + //add_filter('puc_request_update_result_theme-Nebula', array($this, 'theme_update_version_store'), 10, 2); //This hook is found in UpdateChecker.php in the filterUpdateResult() function. + //add_filter('site_transient_update_themes', array($this, 'force_nebula_theme_update'), 99, 1); } } @@ -1098,8 +1098,7 @@ public function theme_json(){ $this->update_data('current_version_date', $this->version('date')); } - if ( !$this->allow_theme_update() ){ - //Check for unsupported version: if newer version of Nebula has a "u" at the end of the version number, disable automated updates. + if ( 1==1 ){ //No longer allow theme updates on this branch $remote_version_info = get_option('external_theme_updates-Nebula-main'); if ( !empty($remote_version_info->checkedVersion) && strpos($remote_version_info->checkedVersion, 'u') && str_replace('u', '', $remote_version_info->checkedVersion) !== str_replace('u', '', $this->version('raw')) ){ $this->update_data('version_legacy', 'true'); @@ -1107,13 +1106,6 @@ public function theme_json(){ $this->update_data('current_version_date', $this->version('date')); $this->update_data('next_version', 'INCOMPATIBLE'); } - } elseif ( current_user_can('update_themes') && is_child_theme() ){ - require_once get_template_directory() . '/inc/vendor/plugin-update-checker/plugin-update-checker.php'; - $theme_update_checker = Puc_v4_Factory::buildUpdateChecker( - 'https://raw.githubusercontent.com/chrisblakley/Nebula/main/inc/data/nebula_theme.json', - get_template_directory() . '/functions.php', - 'Nebula' //The filter hook above must match this - ); } } diff --git a/libs/Utilities/Utilities.php b/libs/Utilities/Utilities.php index e70b04992..630adb2e4 100644 --- a/libs/Utilities/Utilities.php +++ b/libs/Utilities/Utilities.php @@ -68,7 +68,7 @@ public function is_nebula(){ //Generate Nebula Session ID public function nebula_session_id(){ $timer_name = $this->timer('Session ID'); - $server_generated_session_id = ( session_id() )? session_id() : '!' . uniqid(); //@todo "nebula" 0: decommission for session + $server_generated_session_id = '!' . uniqid(); //Check object cache first $session_id = wp_cache_get('nebula_session_id', $server_generated_session_id); //If session_id() is not available, it will re-generate the Nebula session ID diff --git a/style.css b/style.css index 653025389..67fad82c5 100644 --- a/style.css +++ b/style.css @@ -5,7 +5,7 @@ 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: Pinckney Hugo Group Author URI: http://www.pinckneyhugo.com - Version: 8.9.5.7625 + Version: 8.9.32.001 License: GNU General Public License v2.0 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: one-column, two-columns, three-columns, four-columns, left-sidebar, right-sidebar, threaded-comments, theme-options, sticky-post, post-formats, microformats, full-width-template, front-page-post-form, flexible-header, featured-images, featured-image-header, editor-style, custom-menu, custom-colors, accessibility-ready