diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php index f691c97..bfb06fc 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php @@ -414,7 +414,7 @@ function entityFormValidate($form, &$form_state) { if (!empty($translation['name']) && !($account = user_load_by_name($translation['name']))) { form_set_error('content_translation][name', $form_state, t('The translation authoring username %name does not exist.', array('%name' => $translation['name']))); } - // Validate the "authored on" field. + // Validate the "created on" field. if (!empty($translation['created']) && strtotime($translation['created']) === FALSE) { form_set_error('content_translation][created', $form_state, t('You have to specify a valid translation authoring date.')); } diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeCacheTagsTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeCacheTagsTest.php index 0d3dc2a..ca5711e 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeCacheTagsTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeCacheTagsTest.php @@ -63,7 +63,7 @@ protected function createEntity() { * {@inheritdoc} */ protected function getAdditionalCacheTagsForEntity(EntityInterface $node) { - return array('user:' . $node->getOwnerId()); + return array('user:' . $node->getOwnerId(), 'user_view:' . TRUE); } } diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php index 4012908..dbe8ac5 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php @@ -158,11 +158,11 @@ protected function doTestAuthoringInfo() { 'promote' => (bool) mt_rand(0, 1), ); $edit = array( - 'uid' => $user->getUsername(), - 'created[date]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d'), - 'created[time]' => format_date($values[$langcode]['created'], 'custom', 'H:i:s'), - 'sticky' => $values[$langcode]['sticky'], - 'promote' => $values[$langcode]['promote'], + 'uid[0][target_id]' => $user->getUsername(), + 'created[0][value][date]' => format_date($values[$langcode]['created'], 'custom', 'Y-m-d'), + 'created[0][value][time]' => format_date($values[$langcode]['created'], 'custom', 'H:i:s'), + 'sticky[0][value]' => $values[$langcode]['sticky'], + 'promote[0][value]' => $values[$langcode]['promote'], ); $this->drupalPostForm($path, $edit, $this->getFormSubmitAction($entity, $langcode), array('language' => $languages[$langcode])); } @@ -170,7 +170,7 @@ protected function doTestAuthoringInfo() { $entity = entity_load($this->entityTypeId, $this->entityId, TRUE); foreach ($this->langcodes as $langcode) { $this->assertEqual($entity->translation[$langcode]['uid'], $values[$langcode]['uid'], 'Translation author correctly stored.'); - $this->assertEqual($entity->translation[$langcode]['created'], $values[$langcode]['created'], 'Translation date correctly stored.'); + $this->assertEqual($entity->translation[$langcode]['created'], $values[$langcode]['created'][0]['value'], 'Translation date correctly stored.'); $translation = $entity->getTranslation($langcode); $this->assertEqual($translation->getOwnerId(), $values[$langcode]['uid'], 'Author of translation correctly stored.'); $this->assertEqual($translation->getCreatedTime(), $values[$langcode]['created'], 'Date of Translation correctly stored.'); diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php index 7e9d1d5..72529d5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Cache/PageCacheTagsIntegrationTest.php @@ -91,6 +91,7 @@ function testPageCacheTags() { 'node_view:1', 'node:' . $node_1->id(), 'user:' . $author_1->id(), + 'user_view:' . TRUE, 'filter_format:basic_html', 'menu:tools', 'menu:footer', @@ -116,6 +117,7 @@ function testPageCacheTags() { 'node_view:1', 'node:' . $node_2->id(), 'user:' . $author_2->id(), + 'user_view:' . TRUE, 'filter_format:full_html', 'menu:tools', 'menu:footer',