aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template/template.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/template/template.php')
-rw-r--r--phpBB/includes/template/template.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 75bbbe2ef3..11d226d705 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -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
proxy_wizard/Squid.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 41fd9634..06b94cf3 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -119,7 +119,7 @@ $o->{pages} = {
$o->{var}{wiz_squid_mynetw} ||= network_mask()
},
data => [
- { label => 'Authorized network:', val => \$o->{var}{wiz_squid_mynetw}, help => N("Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\"") },
+ { label => N("Authorized network:"), val => \$o->{var}{wiz_squid_mynetw}, help => N("Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\"") },
],
next => 'cachepeer'
},
@@ -139,8 +139,8 @@ $o->{pages} = {
valcachepeer => {
name => N("Cache hierarchy") . "\n\n" . N("Enter the qualified hostname (like \"cache.domain.net\") and the port of the proxy to use."),
data => [
- { label => 'Upper level proxy hostname:', val => \$o->{var}{wiz_squid_cachepeer} },
- { label => 'Upper level proxy port:', val => \$o->{var}{wiz_squid_peerport} },
+ { label => N("Upper level proxy hostname:"), val => \$o->{var}{wiz_squid_cachepeer} },
+ { label => N("Upper level proxy port:"), val => \$o->{var}{wiz_squid_peerport} },
],
next => 'summary'
},