diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-03-05 15:25:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-03-05 15:25:30 +0100 |
| commit | 7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb (patch) | |
| tree | 19d1b86fa6ef3334224ada4a2cfd2546778dec7b /phpBB/includes/ucp/ucp_profile.php | |
| parent | 87ca5ef7e5610c72efcb3fd92d415082004d5ae2 (diff) | |
| parent | 7e0d54a331ccb569dafeae8b051db5a34e177b5f (diff) | |
| download | forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.gz forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.bz2 forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.tar.xz forums-7c26cd25c7526cf9ab0bd2915f08e2b8d66a59fb.zip | |
Merge pull request #3434 from nickvergessen/ticket/13647
[ticket/13647] Move FAQ page to a controller
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index cc1e58edac..8adb96b6ab 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -548,6 +548,9 @@ class ucp_profile $decoded_message = generate_text_for_edit($signature, $bbcode_uid, $bbcode_bitfield); + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'SIGNATURE' => $decoded_message['text'], @@ -557,7 +560,7 @@ class ucp_profile 'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '', 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '', - 'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>') : sprintf($user->lang['BBCODE_IS_OFF'], '<a href="' . append_sid("{$phpbb_root_path}faq.$phpEx", 'mode=bbcode') . '">', '</a>'), + 'BBCODE_STATUS' => $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '<a href="' . $controller_helper->route('phpbb_help_controller', array('mode' => 'bbcode')) . '">', '</a>'), 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], 'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], 'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], |