Skip to content

Commit 15e6e42

Browse files
committed
IE11 bugfix, disabled theme updater
#2144
1 parent 98eeacb commit 15e6e42

File tree

7 files changed

+10
-18
lines changed

7 files changed

+10
-18
lines changed

.github/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nebula-wp",
33
"title": "Nebula",
44
"description": "Advanced Starter WordPress Theme for Developers",
5-
"version": "8.9.5",
5+
"version": "8.9.32",
66
"homepage": "https://gearside.com/nebula/",
77
"repository": {
88
"type": "git",

assets/js/nebula.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ nebula.registerServiceWorker = function(){
283283
} else { //If the Service Worker option is disabled
284284
//Force unregister any existing SWs
285285
navigator.serviceWorker.getRegistrations().then(function(registrations){
286-
for ( let registration of registrations ){
286+
for ( var registration of registrations ){
287287
registration.unregister();
288288
}
289289
});

assets/scss/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
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.
55
Author: Pinckney Hugo Group
66
Author URI: http://www.pinckneyhugo.com
7-
Version: 8.9.5.7626
7+
Version: 8.9.32.001
88
License: GNU General Public License v2.0 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010
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

inc/data/nebula_theme.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "8.9.5.7625",
2+
"version": "8.9.32.001",
33
"details_url": "https://github.com/chrisblakley/Nebula/commits/main",
44
"download_url": "https://github.com/chrisblakley/Nebula/archive/main.zip"
55
}

libs/Admin/Admin.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function hooks(){
2424
add_filter('nebula_brain', array($this, 'admin_brain'));
2525
add_action('save_post', array($this, 'clear_transients'));
2626
add_action('profile_update', array($this, 'clear_transients'));
27-
add_action('upgrader_process_complete', array($this, 'theme_update_automation'), 10, 2); //Action 'upgrader_post_install' also exists.
27+
//add_action('upgrader_process_complete', array($this, 'theme_update_automation'), 10, 2); //Action 'upgrader_post_install' also exists.
2828
add_filter('auth_cookie_expiration', array($this, 'session_expire'));
2929
add_action('after_setup_theme', array($this, 'custom_media_display_settings'));
3030

@@ -43,8 +43,8 @@ public function hooks(){
4343

4444
if ( current_user_can('edit_others_posts') ){
4545
add_action('admin_init', array($this, 'theme_json'));
46-
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.
47-
add_filter('site_transient_update_themes', array($this, 'force_nebula_theme_update'), 99, 1);
46+
//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.
47+
//add_filter('site_transient_update_themes', array($this, 'force_nebula_theme_update'), 99, 1);
4848
}
4949
}
5050

@@ -1098,22 +1098,14 @@ public function theme_json(){
10981098
$this->update_data('current_version_date', $this->version('date'));
10991099
}
11001100

1101-
if ( !$this->allow_theme_update() ){
1102-
//Check for unsupported version: if newer version of Nebula has a "u" at the end of the version number, disable automated updates.
1101+
if ( 1==1 ){ //No longer allow theme updates on this branch
11031102
$remote_version_info = get_option('external_theme_updates-Nebula-main');
11041103
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')) ){
11051104
$this->update_data('version_legacy', 'true');
11061105
$this->update_data('current_version', $this->version('raw'));
11071106
$this->update_data('current_version_date', $this->version('date'));
11081107
$this->update_data('next_version', 'INCOMPATIBLE');
11091108
}
1110-
} elseif ( current_user_can('update_themes') && is_child_theme() ){
1111-
require_once get_template_directory() . '/inc/vendor/plugin-update-checker/plugin-update-checker.php';
1112-
$theme_update_checker = Puc_v4_Factory::buildUpdateChecker(
1113-
'https://raw.githubusercontent.com/chrisblakley/Nebula/main/inc/data/nebula_theme.json',
1114-
get_template_directory() . '/functions.php',
1115-
'Nebula' //The filter hook above must match this
1116-
);
11171109
}
11181110
}
11191111

libs/Utilities/Utilities.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function is_nebula(){
6868
//Generate Nebula Session ID
6969
public function nebula_session_id(){
7070
$timer_name = $this->timer('Session ID');
71-
$server_generated_session_id = ( session_id() )? session_id() : '!' . uniqid(); //@todo "nebula" 0: decommission for session
71+
$server_generated_session_id = '!' . uniqid();
7272

7373
//Check object cache first
7474
$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

style.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)