makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 12:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop

Browse source 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
  [ticket/11973] Remove logic from tokens language array
This commit is contained in:
Dhruv 2013-11-04 00:11:23 +05:30
commit efe94e9c73
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/acp/acp_bbcodes.php
View file

@ -108,11 +108,12 @@ class acp_bbcodes
'DISPLAY_ON_POSTING' => $display_on_posting) 'DISPLAY_ON_POSTING' => $display_on_posting)
); );
foreach ($user->lang['tokens'] as $token => $token_explain) $bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR');
foreach ($bbcode_tokens as $token)
{ {
$template->assign_block_vars('token', array( $template->assign_block_vars('token', array(
'TOKEN' => '{' . $token . '}', 'TOKEN' => '{' . $token . '}',
'EXPLAIN' => ($token === 'LOCAL_URL') ? sprintf($token_explain, generate_board_url() . '/') : $token_explain, 'EXPLAIN' => ($token === 'LOCAL_URL') ? $user->lang(array('tokens', $token), generate_board_url() . '/') : $user->lang(array('tokens', $token)),
)); ));
} }