diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
index fff5b1e929..14271dc459 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -23,6 +23,18 @@ use Doctrine\DBAL\Schema\SchemaException;
*/
class InitAclCommand extends ContainerAwareCommand
{
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled()
+ {
+ if (!$this->getContainer()->has('security.acl.dbal.connection')) {
+ return false;
+ }
+
+ return parent::isEnabled();
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 510d030517..355ba26f24 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -305,10 +305,7 @@ class Container implements IntrospectableContainerInterface
$service = $this->$method();
} catch (\Exception $e) {
unset($this->loading[$id]);
-
- if (array_key_exists($id, $this->services)) {
- unset($this->services[$id]);
- }
+ unset($this->services[$id]);
if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
return;
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 777f4a6054..74da38203c 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -495,9 +495,7 @@ class Definition
*/
public function clearTag($name)
{
- if (isset($this->tags[$name])) {
- unset($this->tags[$name]);
- }
+ unset($this->tags[$name]);
return $this;
}
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
index 2e8585a75c..0db5eddbe6 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
@@ -11,8 +11,8 @@
アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。
-
- CSRFトークンが無効です。
+
+ CSRFトークンが無効です、再送信してください。