diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php index ec0562b..cd4854c 100644 --- a/core/modules/user/lib/Drupal/user/AccountFormController.php +++ b/core/modules/user/lib/Drupal/user/AccountFormController.php @@ -2,22 +2,22 @@ /** * @file - * Contains \Drupal\user\AccountFormController. + * Definition of Drupal\user\AccountFormController. */ namespace Drupal\user; +use Drupal\Core\Entity\EntityControllerInterface; use Drupal\Core\Entity\EntityFormController; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; -use Drupal\Core\Entity\EntityControllerInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Form controller for the user account forms. */ -abstract class AccountFormController extends EntityFormControllerNG implements EntityControllerInterface { +abstract class AccountFormController extends EntityFormController implements EntityControllerInterface { /** * The module handler to invoke hooks on. @@ -25,16 +25,16 @@ * @var \Drupal\Core\Extension\ModuleHandlerInterface */ protected $moduleHandler; - + /** * The language manager. * * @var \Drupal\Core\Language\LanguageManager */ protected $languageManager; - + /** - * Constructs a new EntityFormController object. + * Constructs a new AccountFormController object. * * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler * The module handler to invoke hooks on. @@ -45,7 +45,7 @@ public function __construct(ModuleHandlerInterface $module_handler, LanguageMana $this->moduleHandler = $module_handler; $this->languageManager = $language_manager; } - + /** * {@inheritdoc} */ @@ -55,7 +55,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ $container->get('language_manager') ); } - + /** * {@inheritdoc} */ @@ -259,6 +259,7 @@ public function form(array $form, array &$form_state) { '#default_value' => $user_preferred_admin_langcode, '#access' => $show_admin_language && user_access('access administration pages', $account), ); + // User entities contain both a langcode property (for identifying the // language of the entity data) and a preferred_langcode property (see // above). Rather than provide a UI forcing the user to choose both