File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change 8
8
* License: GNU/GPLv2
9
9
* @see LICENSE.txt
10
10
*
11
- * This file: PHPMailer-phpMussel linker (last modified: 2021.08.25 ).
11
+ * This file: PHPMailer-phpMussel linker (last modified: 2021.09.05 ).
12
12
*/
13
13
14
14
namespace phpMussel \PHPMailer ;
@@ -41,17 +41,15 @@ public function __construct(\phpMussel\Core\Loader &$Loader)
41
41
/** Link the loader to this instance. */
42
42
$ this ->Loader = &$ Loader ;
43
43
44
- /** Load configuration defaults and perform fallbacks. */
44
+ /** Load PHPMailer-phpMussel linker configuration defaults and perform fallbacks. */
45
45
if (
46
46
is_readable ($ this ->AssetsPath . 'config.yml ' ) &&
47
47
$ Configuration = $ this ->Loader ->readFile ($ this ->AssetsPath . 'config.yml ' )
48
48
) {
49
49
$ Defaults = [];
50
- $ this ->Loader ->YAML ->process ($ Configuration , $ Defaults , 0 , true );
51
- if (isset ($ Defaults )) {
52
- $ this ->Loader ->fallback ($ Defaults );
53
- $ this ->Loader ->ConfigurationDefaults = array_merge_recursive ($ this ->Loader ->ConfigurationDefaults , $ Defaults );
54
- }
50
+ $ this ->Loader ->YAML ->process ($ Configuration , $ Defaults );
51
+ $ this ->Loader ->fallback ($ Defaults );
52
+ $ this ->Loader ->ConfigurationDefaults = array_merge_recursive ($ this ->Loader ->ConfigurationDefaults , $ Defaults );
55
53
}
56
54
57
55
/** Register log paths. */
You can’t perform that action at this time.
0 commit comments