Merge pull request #17665 from frederic34/patch-4
Fix issue when loading external libs (pb with autoloader conflict and luracast)
This commit is contained in:
commit
854292b77e
@ -263,7 +263,7 @@ class AutoLoader
|
|||||||
* @return bool false unless className now exists
|
* @return bool false unless className now exists
|
||||||
*/
|
*/
|
||||||
private function loadLastResort($className, $loader = null) {
|
private function loadLastResort($className, $loader = null) {
|
||||||
$loaders = array_unique(static::$rogueLoaders);
|
$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
|
||||||
if (isset($loader)) {
|
if (isset($loader)) {
|
||||||
if (false === array_search($loader, $loaders))
|
if (false === array_search($loader, $loaders))
|
||||||
static::$rogueLoaders[] = $loader;
|
static::$rogueLoaders[] = $loader;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user