diff --git a/core/modules/content_translation/content_translation.pages.inc b/core/modules/content_translation/content_translation.pages.inc index e11afb7..9f06142 100644 --- a/core/modules/content_translation/content_translation.pages.inc +++ b/core/modules/content_translation/content_translation.pages.inc @@ -27,7 +27,7 @@ function content_translation_overview(EntityInterface $entity) { foreach (array('canonical', 'edit-form', 'translation-overview') as $name) { $rel[$name] = $entity->uri($name); } - $base_path = $rel['translation-overview']['path']; + $translation_path = $rel['translation-overview']['path']; $header = array(t('Language'), t('Translation'), t('Source language'), t('Status'), t('Operations')); $rows = array(); @@ -53,11 +53,11 @@ function content_translation_overview(EntityInterface $entity) { foreach ($languages as $language) { $language_name = $language->name; $langcode = $language->id; - $add_path = $base_path . '/add/' . $original . '/' . $langcode; - $translate_path = $base_path . '/edit/' . $langcode; - $delete_path = $base_path . '/delete/' . $langcode; + $add_path = $translation_path . '/add/' . $original . '/' . $langcode; + $translate_path = $translation_path . '/edit/' . $langcode; + $delete_path = $translation_path . '/delete/' . $langcode; - if ($base_path) { + if ($translation_path) { $add_links = _content_translation_get_switch_links($add_path); $edit_links = _content_translation_get_switch_links($rel['edit-form']['path']); $translate_links = _content_translation_get_switch_links($translate_path); diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoUri.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoUri.php index 62a9cb7..f6fc568 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoUri.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestNoUri.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTest. + * Definition of Drupal\entity_test\Plugin\Core\Entity\EntityTestNoUri. */ namespace Drupal\entity_test\Plugin\Core\Entity; @@ -35,6 +35,7 @@ * "bundle" = "type", * } * ) - */class EntityTestNoUri extends EntityTest { + */ +class EntityTestNoUri extends EntityTest { }