Skip to content

Commit

Permalink
Merge pull request FluidTYPO3#855 from jmverges/fixTemplateRootPaths
Browse files Browse the repository at this point in the history
[BUGFIX] Change from 10 to 0 for root paths
  • Loading branch information
NamelessCoder committed Jul 24, 2015
2 parents c0a970f + 707e0c1 commit ba66792
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Classes/Service/FluxService.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@ public function getGridFromTemplateFile(ViewContext $viewContext, $gridName = 'g
protected function getDefaultViewConfigurationForExtensionKey($extensionKey) {
$extensionKey = ExtensionNamingUtility::getExtensionKey($extensionKey);
return array(
TemplatePaths::CONFIG_TEMPLATEROOTPATHS => array(10 => 'EXT:' . $extensionKey . '/Resources/Private/Templates/'),
TemplatePaths::CONFIG_PARTIALROOTPATHS => array(10 => 'EXT:' . $extensionKey . '/Resources/Private/Partials/'),
TemplatePaths::CONFIG_LAYOUTROOTPATHS => array(10 => 'EXT:' . $extensionKey . '/Resources/Private/Layouts/'),
TemplatePaths::CONFIG_TEMPLATEROOTPATHS => array(0 => 'EXT:' . $extensionKey . '/Resources/Private/Templates/'),
TemplatePaths::CONFIG_PARTIALROOTPATHS => array(0 => 'EXT:' . $extensionKey . '/Resources/Private/Partials/'),
TemplatePaths::CONFIG_LAYOUTROOTPATHS => array(0 => 'EXT:' . $extensionKey . '/Resources/Private/Layouts/'),
);
}

Expand Down
6 changes: 3 additions & 3 deletions Tests/Unit/Service/FluxServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ public function canGetBackendViewConfigurationForExtensionName() {
*/
public function canGetViewConfigurationForExtensionNameWhichDoesNotExistAndConstructDefaults() {
$expected = array(
'templateRootPaths' => array(10 => 'EXT:void/Resources/Private/Templates/'),
'partialRootPaths' => array(10 => 'EXT:void/Resources/Private/Partials/'),
'layoutRootPaths' => array(10 => 'EXT:void/Resources/Private/Layouts/'),
'templateRootPaths' => array(0 => 'EXT:void/Resources/Private/Templates/'),
'partialRootPaths' => array(0 => 'EXT:void/Resources/Private/Partials/'),
'layoutRootPaths' => array(0 => 'EXT:void/Resources/Private/Layouts/'),
);
$service = $this->createFluxServiceInstance();
$config = $service->getViewConfigurationForExtensionName('void');
Expand Down

0 comments on commit ba66792

Please sign in to comment.