aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-08 13:59:24 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-11 15:49:45 -0400
commit29b472c2e5c8a878b592c53733cc57961d60a0af (patch)
tree172b01621f80c97d8e1bbbda5364d0f75a874909 /phpBB/includes
parent80eb95bbb7685995ccc2cfa46280aef6e8ef024a (diff)
downloadforums-29b472c2e5c8a878b592c53733cc57961d60a0af.tar
forums-29b472c2e5c8a878b592c53733cc57961d60a0af.tar.gz
forums-29b472c2e5c8a878b592c53733cc57961d60a0af.tar.bz2
forums-29b472c2e5c8a878b592c53733cc57961d60a0af.tar.xz
forums-29b472c2e5c8a878b592c53733cc57961d60a0af.zip
[ticket/11626] Include the template file in acp_board
PHPBB3-11626
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_board.php8
-rw-r--r--phpBB/includes/auth/provider/ldap.php1
2 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f142801b72..4c5f951bdc 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -655,15 +655,13 @@ class acp_board
foreach ($auth_providers as $provider)
{
- $fields = $provider->acp($this->new_config);
-
- if ($fields['tpl'])
+ $auth_tpl = $provider->get_acp_template($this->new_config);
+ if ($auth_tpl)
{
$template->assign_block_vars('auth_tpl', array(
- 'TPL' => $fields['tpl'],
+ 'TPL' => $provider->get_acp_template($this->new_config),
));
}
- unset($fields);
}
}
}
diff --git a/phpBB/includes/auth/provider/ldap.php b/phpBB/includes/auth/provider/ldap.php
index b063f6d682..0164a60f2e 100644
--- a/phpBB/includes/auth/provider/ldap.php
+++ b/phpBB/includes/auth/provider/ldap.php
@@ -37,6 +37,7 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
$this->db = $db;
$this->config = $config;
$this->user = $user;
+ $this->template = $template;
}
/**