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

[ticket/11626] Include the template file in acp_board

Browse source 
PHPBB3-11626
This commit is contained in:
Joseph Warner 2013-07-08 13:59:24 -04:00
parent 80eb95bbb7
commit 29b472c2e5
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_board.html
View file

@ -34,7 +34,7 @@
<!-- IF S_AUTH --> <!-- IF S_AUTH -->
<!-- BEGIN auth_tpl --> <!-- BEGIN auth_tpl -->
{auth_tpl.TPL} <!-- INCLUDE {auth_tpl.TPL} -->
<!-- END auth_tpl --> <!-- END auth_tpl -->
<!-- ENDIF --> <!-- ENDIF -->

8
phpBB/includes/acp/acp_board.php
View file

@ -655,15 +655,13 @@ class acp_board
foreach ($auth_providers as $provider) foreach ($auth_providers as $provider)
{ {
$fields = $provider->acp($this->new_config); $auth_tpl = $provider->get_acp_template($this->new_config);
if ($auth_tpl)
if ($fields['tpl'])
{ {
$template->assign_block_vars('auth_tpl', array( $template->assign_block_vars('auth_tpl', array(
'TPL' => $fields['tpl'], 'TPL' => $provider->get_acp_template($this->new_config),
)); ));
} }
unset($fields);
} }
} }
} }

1
phpBB/includes/auth/provider/ldap.php
View file

@ -37,6 +37,7 @@ class phpbb_auth_provider_ldap extends phpbb_auth_provider_base
$this->db = $db; $this->db = $db;
$this->config = $config; $this->config = $config;
$this->user = $user; $this->user = $user;
$this->template = $template;
} }
/** /**