makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/controller] Don't attempt to assign if no variable is give

Browse source 
PHPBB3-10864
This commit is contained in:
David King 2012-11-13 09:57:51 -05:00
parent b5255d4ea4
commit ef46af8298
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/template/template.php
View file

@ -227,12 +227,15 @@ class phpbb_template
{
$contents = $this->return_display($handle);
if (!$template_var)
if (!$template_var && !$return_contents)
{
throw new RuntimeException($this->user->lang('TEMPLATE_CANNOT_BE_ASSIGNED'));
}
$this->assign_var($template_var, $contents);
if ($template_var)
{
$this->assign_var($template_var, $contents);
}
// If !$return_content evaluates to true, true will be returned
// Otherwise, the value of $contents will be returned