Selaa lähdekoodia

fix missing settings object

Tim Fry 3 kuukautta sitten
vanhempi
commit
03e946a414
1 muutettua tiedostoa jossa 5 lisäystä ja 0 poistoa
  1. 5 0
      index.php

+ 5 - 0
index.php

@@ -77,6 +77,11 @@
 //save the sanitized value
 //save the sanitized value
 	$_SESSION['app']['edit']['dir'] = $dir;
 	$_SESSION['app']['edit']['dir'] = $dir;
 
 
+//ensure we have a settings object for older installs
+if (empty($settings) || !($settings instanceof settings)) {
+	$settings = new settings(['database' => database::new(), 'domain_uuid' => $domain_uuid ?? $_SESSION['domain_uuid'] ?? '', 'user_uuid' => $user_uuid ?? $_SESSION['user_uuid'] ?? '']);
+}
+
 //load editor preferences/defaults
 //load editor preferences/defaults
 	$setting_size       = $settings->get('editor', 'font_size', '12px');
 	$setting_size       = $settings->get('editor', 'font_size', '12px');
 	$setting_theme      = $settings->get('editor', 'theme', 'cobalt');
 	$setting_theme      = $settings->get('editor', 'theme', 'cobalt');