Index: core/modules/ckeditor/ckeditor.module IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/ckeditor/ckeditor.module (date 1396049254000) +++ core/modules/ckeditor/ckeditor.module (revision ) @@ -79,8 +79,8 @@ $css[$key] = $theme_path . '/' . $path; } } - if (isset($info['base theme'])) { - $css = array_merge(_ckeditor_theme_css($info['base theme'], $css)); + if (isset($info['base'])) { + $css = array_merge(_ckeditor_theme_css($info['base'], $css)); } } return $css; Index: core/includes/theme.inc IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/includes/theme.inc (date 1396049254000) +++ core/includes/theme.inc (revision ) @@ -124,7 +124,7 @@ * @param \Drupal\Core\Extension\Extension $theme * The theme extension object. * @param \Drupal\Core\Extension\Extension[] $base_theme - * An optional array of objects that represent the 'base theme' if the + * An optional array of objects that represent the 'base' if the * theme is meant to be derivative of another theme. It requires * the same information as the $theme object. It should be in * 'oldest first' order, meaning the top level of the chain will Index: core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml (date 1396049254000) +++ core/modules/system/tests/themes/test_invalid_basetheme/test_invalid_basetheme.info.yml (revision ) @@ -3,5 +3,5 @@ description: 'Test theme which has a non-existent base theme.' version: VERSION core: 8.x -'base theme': not_real_test_basetheme +base: not_real_test_basetheme hidden: true Index: core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php (date 1396049254000) +++ core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php (revision ) @@ -55,7 +55,7 @@ * in the .info.yml file. * - prefix: The base theme engine prefix. * - engine: The machine name of the theme engine. - * - base_theme: If this is a sub-theme, the machine name of the base theme + * - base: If this is a sub-theme, the machine name of the base theme * defined in the .info.yml file. Otherwise, the element is not set. * - base_themes: If this is a sub-theme, an associative array of the * base-theme ancestors of this theme, starting with this theme's base Index: core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml (date 1396049254000) +++ core/modules/breakpoint/tests/themes/breakpoint_test_theme/breakpoint_test_theme.info.yml (revision ) @@ -3,5 +3,5 @@ description: 'Test theme for breakpoint.' version: VERSION core: 8.x -'base theme': bartik +base: bartik hidden: true Index: core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml (date 1396049254000) +++ core/modules/update/tests/themes/update_test_subtheme/update_test_subtheme.info.yml (revision ) @@ -3,5 +3,5 @@ description: 'Test theme which uses update_test_basetheme as the base theme.' version: VERSION core: 8.x -'base theme': update_test_basetheme +base: update_test_basetheme hidden: true Index: core/lib/Drupal/Core/Extension/InfoParserInterface.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/lib/Drupal/Core/Extension/InfoParserInterface.php (date 1396049254000) +++ core/lib/Drupal/Core/Extension/InfoParserInterface.php (revision ) @@ -35,7 +35,7 @@ * Information stored in a theme .info.yml file: * - screenshot: Path to screenshot relative to the theme's .info.yml file. * - engine: Theme engine; typically twig. - * - base theme: Name of a base theme, if applicable. + * - base: Name of a base theme, if applicable. * - regions: Listed regions. * - features: Features available. * - stylesheets: Theme stylesheets. Index: core/modules/system/lib/Drupal/system/Controller/SystemController.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/system/lib/Drupal/system/Controller/SystemController.php (date 1396049254000) +++ core/modules/system/lib/Drupal/system/Controller/SystemController.php (revision ) @@ -230,7 +230,7 @@ $theme->incompatible_core = !isset($theme->info['core']) || ($theme->info['core'] != \DRUPAL::CORE_COMPATIBILITY) || !isset($theme->info['regions']['content']); $theme->incompatible_php = version_compare(phpversion(), $theme->info['php']) < 0; // Confirmed that the base theme is available. - $theme->incompatible_base = isset($theme->info['base theme']) && !isset($themes[$theme->info['base theme']]); + $theme->incompatible_base = isset($theme->info['base']) && !isset($themes[$theme->info['base']]); // Confirm that the theme engine is available. $theme->incompatible_engine = isset($theme->info['engine']) && !isset($theme->owner); } Index: core/lib/Drupal/Core/Extension/ThemeHandler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/lib/Drupal/Core/Extension/ThemeHandler.php (date 1396049254000) +++ core/lib/Drupal/Core/Extension/ThemeHandler.php (revision ) @@ -212,8 +212,8 @@ if (isset($theme->info['engine'])) { $theme->engine = $theme->info['engine']; } - if (isset($theme->info['base theme'])) { - $theme->base_theme = $theme->info['base theme']; + if (isset($theme->info['base'])) { + $theme->base_theme = $theme->info['base']; } // Status is normally retrieved from the database. Add zero values when // read from the installation directory to prevent notices. @@ -283,7 +283,7 @@ $type = 'theme'; $this->moduleHandler->alter('system_info', $theme->info, $theme, $type); - if (!empty($theme->info['base theme'])) { + if (!empty($theme->info['base'])) { $sub_themes[] = $key; } @@ -390,11 +390,11 @@ * An array of base themes. */ protected function doGetBaseThemes(array $themes, $theme, $used_themes = array()) { - if (!isset($themes[$theme]->info['base theme'])) { + if (!isset($themes[$theme]->info['base'])) { return array(); } - $base_key = $themes[$theme]->info['base theme']; + $base_key = $themes[$theme]->info['base']; // Does the base theme exist? if (!isset($themes[$base_key])) { return array($base_key => NULL); @@ -403,7 +403,7 @@ $current_base_theme = array($base_key => $themes[$base_key]->info['name']); // Is the base theme itself a child of another theme? - if (isset($themes[$base_key]->info['base theme'])) { + if (isset($themes[$base_key]->info['base'])) { // Do we already know the base themes of this theme? if (isset($themes[$base_key]->base_themes)) { return $themes[$base_key]->base_themes + $current_base_theme; Index: core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml (date 1396049254000) +++ core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml (revision ) @@ -3,7 +3,7 @@ description: 'Test theme which uses test_basetheme as the base theme.' version: VERSION core: 8.x -'base theme': test_basetheme +base: test_basetheme hidden: true stylesheets: all: Index: core/modules/edit/edit.module IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/edit/edit.module (date 1396049254000) +++ core/modules/edit/edit.module (revision ) @@ -80,8 +80,8 @@ if ($theme && $theme_path = drupal_get_path('theme', $theme)) { $info = system_get_info('theme', $theme); // Recurse to process base theme(s) first. - if (isset($info['base theme'])) { - edit_library_alter($library, $name, $info['base theme']); + if (isset($info['base'])) { + edit_library_alter($library, $name, $info['base']); } if (isset($info['edit_stylesheets']) && is_array($info['edit_stylesheets'])) { foreach ($info['edit_stylesheets'] as $path) { Index: core/modules/system/system.admin.inc IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/modules/system/system.admin.inc (date 1396049254000) +++ core/modules/system/system.admin.inc (revision ) @@ -484,7 +484,7 @@ $current_theme['incompatible'] = t('This theme requires PHP version @php_required and is incompatible with PHP version !php_version.', array('@php_required' => $theme->info['php'], '!php_version' => phpversion())); } elseif (!empty($theme->incompatible_base)) { - $current_theme['incompatible'] = t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => $theme->info['base theme'])); + $current_theme['incompatible'] = t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => $theme->info['base'])); } elseif (!empty($theme->incompatible_engine)) { $current_theme['incompatible'] = t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => $theme->info['engine'])); Index: core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php (date 1396049254000) +++ core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php (revision ) @@ -200,7 +200,7 @@ 'example' => 'theme.js', ), 'engine' => 'twig', - 'base theme' => 'stark', + 'base' => 'stark', ); $list_info = $this->themeHandler->listInfo(); @@ -333,7 +333,7 @@ $this->assertEquals('test_subtheme', $info_subtheme->getName()); // Test the parent/child-theme properties. - $info_subtheme->info['base theme'] = 'test_basetheme'; + $info_subtheme->info['base'] = 'test_basetheme'; $info_basetheme->sub_themes = array('test_subtheme'); $this->assertEquals(DRUPAL_ROOT . '/core/themes/engines/twig/twig.engine', $info_basetheme->owner); @@ -384,7 +384,7 @@ 'name' => 'test_1', 'info' => array( 'name' => 'test_1', - 'base theme' => 'test_2', + 'base' => 'test_2', ), ); $data[] = array($themes, 'test_1', array('test_2' => NULL)); @@ -395,7 +395,7 @@ 'name' => 'test_1', 'info' => array( 'name' => 'test_1', - 'base theme' => 'test_2', + 'base' => 'test_2', ), ); $themes['test_2'] = (object) array( @@ -412,14 +412,14 @@ 'name' => 'test_1', 'info' => array( 'name' => 'test_1', - 'base theme' => 'test_2', + 'base' => 'test_2', ), ); $themes['test_2'] = (object) array( 'name' => 'test_2', 'info' => array( 'name' => 'test_2', - 'base theme' => 'test_3', + 'base' => 'test_3', ), ); $themes['test_3'] = (object) array(