Skip to content

[4.0] Child templates consistency #30387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 4 commits into from
Sep 4, 2020
Merged

[4.0] Child templates consistency #30387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc0928e
Handle templateInherits in all Apps correctly
dgrammatiko Aug 16, 2020
15b510e
API getTemplate() should retrun object
dgrammatiko Aug 17, 2020
7d37f57
Update ApiApplication.php
dgrammatiko Aug 18, 2020
0cc5540
Update InstallationApplication.php
dgrammatiko Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installation/src/Application/InstallationApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ public function getTemplate($params = false)
$template->template = 'template';
$template->params = new Registry;
$template->inheritable = 0;
$template->parent = null;
$template->parent = '';

return $template;
}
Expand Down
11 changes: 11 additions & 0 deletions libraries/src/Application/ApiApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,17 @@ protected function respond($options = array())
public function getTemplate($params = false)
{
// The API application should not need to use a template
if ($params)
{
$template = new \stdClass;
$template->template = 'system';
$template->params = new Registry;
$template->inheritable = 0;
$template->parent = '';

return $template;
}

return 'system';
}

Expand Down
7 changes: 4 additions & 3 deletions libraries/src/Application/WebApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,10 @@ protected function render()
{
// Setup the document options.
$options = array(
'template' => $this->get('theme'),
'file' => $this->get('themeFile', 'index.php'),
'params' => $this->get('themeParams'),
'template' => $this->get('theme'),
'file' => $this->get('themeFile', 'index.php'),
'params' => $this->get('themeParams'),
'templateInherits' => $this->get('themeInherits'),
);

if ($this->get('themes.base'))
Expand Down
21 changes: 14 additions & 7 deletions libraries/src/Error/Renderer/HtmlRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,20 @@ public function render(\Throwable $error): string
$app = Factory::getApplication();

// Get the current template from the application
$template = $app->getTemplate();
$template = $app->getTemplate(true);

// Push the error object into the document
$this->getDocument()->setError($error);

// Add registry file for the template asset
$this->getDocument()->getWebAssetManager()->getRegistry()
->addTemplateRegistryFile($template, $app->getClientId());
$wa = $this->getDocument()->getWebAssetManager()->getRegistry();

$wa->addTemplateRegistryFile($template->template, $app->getClientId());

if (!empty($template->parent))
{
$wa->addTemplateRegistryFile($template->parent, $app->getClientId());
}

if (ob_get_contents())
{
Expand All @@ -63,10 +69,11 @@ public function render(\Throwable $error): string
return $this->getDocument()->render(
false,
[
'template' => $template,
'directory' => JPATH_THEMES,
'debug' => JDEBUG,
'csp_nonce' => $app->get('csp_nonce'),
'template' => $template->template,
'directory' => JPATH_THEMES,
'debug' => JDEBUG,
'csp_nonce' => $app->get('csp_nonce'),
'templateInherits' => $template->parent
]
);
}
Expand Down