diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:11:23 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-11-04 00:11:23 +0530 |
| commit | efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4 (patch) | |
| tree | b3c7f10bd0686318c89898e168f55c7df82e6199 /phpBB/includes/acp | |
| parent | e02836b19caa96828ae19af4ecd4278f3556f6fd (diff) | |
| parent | 6a87388e69dc1e85768bd61f146aa22a8f898130 (diff) | |
| download | forums-efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4.tar forums-efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4.tar.gz forums-efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4.tar.bz2 forums-efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4.tar.xz forums-efe94e9c7369c83d00b0e5bfe8fdfe8f48cca5c4.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
[ticket/11973] Remove logic from tokens language array
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index dca39df38c..575ac84012 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -108,11 +108,12 @@ class acp_bbcodes '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( '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)), )); } |