Merge branch '2.3' into 2.7
* 2.3: Fixed the wrong source name and the ja translation [SecurityBundle] disable the init:acl command if ACL is not used [DI] remove useless condition around unset
This commit is contained in:
commit
d65b92469e
@ -23,6 +23,18 @@ use Doctrine\DBAL\Schema\SchemaException;
|
|||||||
*/
|
*/
|
||||||
class InitAclCommand extends ContainerAwareCommand
|
class InitAclCommand extends ContainerAwareCommand
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public function isEnabled()
|
||||||
|
{
|
||||||
|
if (!$this->getContainer()->has('security.acl.dbal.connection')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::isEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
@ -305,10 +305,7 @@ class Container implements IntrospectableContainerInterface
|
|||||||
$service = $this->$method();
|
$service = $this->$method();
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
unset($this->loading[$id]);
|
unset($this->loading[$id]);
|
||||||
|
unset($this->services[$id]);
|
||||||
if (array_key_exists($id, $this->services)) {
|
|
||||||
unset($this->services[$id]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
|
if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
|
||||||
return;
|
return;
|
||||||
|
@ -495,9 +495,7 @@ class Definition
|
|||||||
*/
|
*/
|
||||||
public function clearTag($name)
|
public function clearTag($name)
|
||||||
{
|
{
|
||||||
if (isset($this->tags[$name])) {
|
unset($this->tags[$name]);
|
||||||
unset($this->tags[$name]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
<target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。</target>
|
<target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="30">
|
<trans-unit id="30">
|
||||||
<source>The CSRF token is invalid.</source>
|
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
|
||||||
<target>CSRFトークンが無効です。</target>
|
<target>CSRFトークンが無効です、再送信してください。</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
|
Reference in New Issue
Block a user