Mercurial > hg > rc2

comparison program/lib/Roundcube/rcube_config.php @ 19:b6a96bdd6b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleaning up php8 Warnings/deprecations
author Charlie Root
date Wed, 08 Oct 2025 08:50:44 -0400
parents 5039cc34571f
children 303b85d5b561
comparison
equal deleted inserted replaced
18:b631c1c7a3ce 19:b6a96bdd6b29
315 // use output buffering, we don't need any output here 315 // use output buffering, we don't need any output here
316 ob_start(); 316 ob_start();
317 include($fpath); 317 include($fpath);
318 ob_end_clean(); 318 ob_end_clean();
319 319
320 if (is_array($config)) { 320 if (is_array($config??null)) {
321 $this->merge($config); 321 $this->merge($config);
322 $success = true; 322 $success = true;
323 } 323 }
324 // deprecated name of config variable 324 // deprecated name of config variable
325 if (isset($rcmail_config) && is_array($rcmail_config)) { 325 if (isset($rcmail_config) && is_array($rcmail_config)) {
451 unset($prefs[$key]); 451 unset($prefs[$key]);
452 } 452 }
453 } 453 }
454 454
455 // larry is the new default skin :-) 455 // larry is the new default skin :-)
456 if ($prefs['skin'] == 'default') { 456 if (($prefs['skin']??null) == 'default') {
457 $prefs['skin'] = self::DEFAULT_SKIN; 457 $prefs['skin'] = self::DEFAULT_SKIN;
458 } 458 }
459 459
460 $this->userprefs = $prefs; 460 $this->userprefs = $prefs;
461 $this->prop = array_merge($this->prop, $prefs); 461 $this->prop = array_merge($this->prop, $prefs);