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