diff options
author | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2013-09-10 15:48:29 -0700 |
commit | fc1dfd779da37128382322ffdc75bf751a0834a3 (patch) | |
tree | 5d43d1847832169510c55c3358c42ccd095b2128 /phpBB/includes/acp | |
parent | 71aeec40f6c4c5e6a69699486b618c2ba67dff2d (diff) | |
parent | 18f6a161017f5350d9487181f4b4ed66a53a0284 (diff) | |
download | forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.gz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.bz2 forums-fc1dfd779da37128382322ffdc75bf751a0834a3.tar.xz forums-fc1dfd779da37128382322ffdc75bf751a0834a3.zip |
Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r-- | phpBB/includes/acp/acp_board.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 12e2a1bf72..51a7628b68 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -658,6 +658,13 @@ class acp_board $auth_tpl = $provider->get_acp_template($this->new_config); if ($auth_tpl) { + if (array_key_exists('BLOCK_VAR_NAME', $auth_tpl)) + { + foreach ($auth_tpl['BLOCK_VARS'] as $block_vars) + { + $template->assign_block_vars($auth_tpl['BLOCK_VAR_NAME'], $block_vars); + } + } $template->assign_vars($auth_tpl['TEMPLATE_VARS']); $template->assign_block_vars('auth_tpl', array( 'TEMPLATE_FILE' => $auth_tpl['TEMPLATE_FILE'], |