aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-12 15:53:36 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-12 15:54:41 -0400
commit631ce22f2c33999229bf05af35e025fb8d399417 (patch)
treefc34115a2d13d6cfb74c6e0eff747df387f0c9e4 /phpBB/includes/acp
parentf24a8e5b8150bcd892585531585ef46f49db0ef7 (diff)
downloadforums-631ce22f2c33999229bf05af35e025fb8d399417.tar
forums-631ce22f2c33999229bf05af35e025fb8d399417.tar.gz
forums-631ce22f2c33999229bf05af35e025fb8d399417.tar.bz2
forums-631ce22f2c33999229bf05af35e025fb8d399417.tar.xz
forums-631ce22f2c33999229bf05af35e025fb8d399417.zip
[ticket/11626] Remove LDAP dependency on template
Returns template vars rather than requiring the template. PHPBB3-11626
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_board.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9285608ae2..ad95ad3da3 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -658,8 +658,9 @@ class acp_board
$auth_tpl = $provider->get_acp_template($this->new_config);
if ($auth_tpl)
{
+ $template->assign_vars($auth_tpl['TEMPLATE_VARS']);
$template->assign_block_vars('auth_tpl', array(
- 'TEMPLATE_FILE' => $auth_tpl,
+ 'TEMPLATE_FILE' => $auth_tpl['TEMPLATE_FILE'],
));
}
}