diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 8b28e76..f6ab885 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -896,7 +896,7 @@ function comment_translation_configuration_element_submit($form, &$form_state) { $key = 'language_configuration'; $comment_form_state = array( 'content_translation' => array('key' => $key), - 'language' => array($key => array('entity_type' => 'comment', 'bundle' => $form['#field']['name'])), + 'language' => array($key => array('entity_type' => 'comment', 'bundle' => $form['#field']->name)), 'values' => array($key => array('content_translation' => $form_state['values']['content_translation'])), ); content_translation_language_configuration_element_submit($form, $comment_form_state); diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index e669873..c41c01f 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -261,7 +261,7 @@ public function query($use_groupby = FALSE) { $this->view->display_handler->options['field_langcode'] ); $placeholder = $this->placeholder(); - $langcode_fallback_candidates = $this->languageManager->getFallbackCandidates(array('operation' => 'views_query', 'langcode' => $langcode, 'data' => $this)); + $langcode_fallback_candidates = $this->languageManager->getFallbackCandidates($langcode, array('operation' => 'views_query', 'data' => $this)); $this->query->addWhereExpression(0, "$column IN($placeholder) OR $column IS NULL", array($placeholder => $langcode_fallback_candidates)); } } diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php index 7140112..fdb39ae 100644 --- a/core/modules/user/lib/Drupal/user/AccountFormController.php +++ b/core/modules/user/lib/Drupal/user/AccountFormController.php @@ -8,6 +8,7 @@ namespace Drupal\user; use Drupal\Core\Entity\ContentEntityFormController; +use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -27,10 +28,13 @@ /** * Constructs a new EntityFormController object. * + * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager + * The entity manager. * @param \Drupal\Core\Language\LanguageManager $language_manager * The language manager. */ - public function __construct(LanguageManager $language_manager) { + public function __construct(EntityManagerInterface $entity_manager, LanguageManager $language_manager) { + parent::__construct($entity_manager); $this->languageManager = $language_manager; } @@ -39,6 +43,7 @@ public function __construct(LanguageManager $language_manager) { */ public static function create(ContainerInterface $container) { return new static( + $container->get('entity.manager'), $container->get('language_manager') ); }