projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
* Dummy extension "yoomedia" added for Yoo! Media's API (Interface 2.0 supported)
[mailer.git]
/
inc
/
extensions
/
ext-maintenance.php
diff --git
a/inc/extensions/ext-maintenance.php
b/inc/extensions/ext-maintenance.php
index 32e7bba2e37347779b0310b7b700451f75264a59..9fd371f7d31ddbf2a946cedc17d0556f7a7e900f 100644
(file)
--- a/
inc/extensions/ext-maintenance.php
+++ b/
inc/extensions/ext-maintenance.php
@@
-111,7
+111,7
@@
case "update": // Update an extension
default: // Do stuff when extension is loaded
$dummy = LOAD_CONFIG();
- $_CONFIG
['maintenance'] = $dummy['maintenance']
;
+ $_CONFIG
= array_merge($_CONFIG, $dummy)
;
unset($dummy);
break;
}