|
134 | 134 | /* |
135 | 135 | * 3. Load some other essential includes. |
136 | 136 | */ |
137 | | -call_user_func(function () { |
138 | | - $loader = require SMF\Config::$vendordir . '/autoload.php'; |
139 | | - $third_party_mappers = []; |
140 | | - |
141 | | - // Ensure $sourcedir is set to something valid. |
142 | | - if (class_exists(Config::class, false) && isset(Config::$sourcedir)) { |
143 | | - $sourcedir = Config::$sourcedir; |
144 | | - } |
| 137 | +$loader = require SMF\Config::$vendordir . '/autoload.php'; |
| 138 | +$third_party_mappers = []; |
145 | 139 |
|
146 | | - if (empty($sourcedir) || !is_dir($sourcedir)) { |
147 | | - $sourcedir = __DIR__; |
148 | | - } |
| 140 | +// Ensure $sourcedir is set to something valid. |
| 141 | +if (class_exists(Config::class, false) && isset(Config::$sourcedir)) { |
| 142 | + $sourcedir = Config::$sourcedir; |
| 143 | +} |
149 | 144 |
|
150 | | - // Do any third-party scripts want in on the fun? |
151 | | - if (!defined('SMF_INSTALLING') && class_exists(Config::class, false)) { |
152 | | - if (!class_exists(IntegrationHook::class, false) && is_file($sourcedir . '/IntegrationHook.php')) { |
153 | | - require_once $sourcedir . '/IntegrationHook.php'; |
154 | | - } |
| 145 | +if (empty($sourcedir) || !is_dir($sourcedir)) { |
| 146 | + $sourcedir = __DIR__; |
| 147 | +} |
155 | 148 |
|
156 | | - if (class_exists(IntegrationHook::class, false)) { |
157 | | - IntegrationHook::call('integrate_autoload', [&$third_party_mappers]); |
158 | | - } |
| 149 | +// Do any third-party scripts want in on the fun? |
| 150 | +if (!defined('SMF_INSTALLING') && class_exists(Config::class, false)) { |
| 151 | + if (!class_exists(IntegrationHook::class, false) && is_file($sourcedir . '/IntegrationHook.php')) { |
| 152 | + require_once $sourcedir . '/IntegrationHook.php'; |
159 | 153 | } |
160 | 154 |
|
161 | | - foreach ($third_party_mappers as $prefix => $dirname) { |
162 | | - $loader->addPsr4($prefix, $dirname); |
| 155 | + if (class_exists(IntegrationHook::class, false)) { |
| 156 | + IntegrationHook::call('integrate_autoload', [&$third_party_mappers]); |
163 | 157 | } |
164 | | -}); |
| 158 | +} |
| 159 | + |
| 160 | +foreach ($third_party_mappers as $prefix => $dirname) { |
| 161 | + $loader->addPsr4($prefix, $dirname); |
| 162 | +} |
165 | 163 |
|
166 | 164 | // Ensure we don't trip over disabled internal functions |
167 | 165 | require_once SMF\Config::$sourcedir . '/Subs-Compat.php'; |
|
0 commit comments