Merge branch '3.2'
* 3.2: fixed bad merge
This commit is contained in:
commit
0e92e0a7ba
@ -46,7 +46,6 @@ class AddSecurityVotersPass implements CompilerPassInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$adm = $container->getDefinition($container->hasDefinition('debug.security.access.decision_manager') ? 'debug.security.access.decision_manager' : 'security.access.decision_manager');
|
$adm = $container->getDefinition($container->hasDefinition('debug.security.access.decision_manager') ? 'debug.security.access.decision_manager' : 'security.access.decision_manager');
|
||||||
$adm->addMethodCall('setVoters', array(array_values($voters)));
|
|
||||||
$adm->addMethodCall('setVoters', array($voters));
|
$adm->addMethodCall('setVoters', array($voters));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user