Mercurial > hg > rc2

diff 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
line wrap: on
line diff
--- a/program/lib/Roundcube/rcube_config.php	Tue Oct 07 11:20:40 2025 -0400
+++ b/program/lib/Roundcube/rcube_config.php	Wed Oct 08 08:50:44 2025 -0400
@@ -317,7 +317,7 @@
                 include($fpath);
                 ob_end_clean();
 
-                if (is_array($config)) {
+                if (is_array($config??null)) {
                     $this->merge($config);
                     $success = true;
                 }
@@ -453,7 +453,7 @@
         }
 
         // larry is the new default skin :-)
-        if ($prefs['skin'] == 'default') {
+        if (($prefs['skin']??null) == 'default') {
             $prefs['skin'] = self::DEFAULT_SKIN;
         }