Mercurial > hg > rc2
comparison program/lib/Roundcube/rcube_config.php @ 12:5039cc34571f
some old, mostly new 7.3->8.4 changes needed
| author | Charlie Root |
|---|---|
| date | Thu, 28 Aug 2025 10:37:42 -0400 |
| parents | 4681f974d28b |
| children | b6a96bdd6b29 |
comparison
equal
deleted
inserted
replaced
| 11:aff04b06b685 | 12:5039cc34571f |
|---|---|
| 320 if (is_array($config)) { | 320 if (is_array($config)) { |
| 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 (is_array($rcmail_config)) { | 325 if (isset($rcmail_config) && is_array($rcmail_config)) { |
| 326 $this->merge($rcmail_config); | 326 $this->merge($rcmail_config); |
| 327 $success = true; | 327 $success = true; |
| 328 } | 328 } |
| 329 } | 329 } |
| 330 } | 330 } |
