diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-27 20:45:12 +0100 | 
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-27 20:45:12 +0100 | 
| commit | 0e8a573a7156e9318bc18fb99da6fa29e2c2c542 (patch) | |
| tree | ba9e4c61bf2e1d3416e55d45bef25fc9a190d43f | |
| parent | 9432662c372df946fa9d5b810a5d4bd9896acc84 (diff) | |
| parent | 642bfe9a3946a4074e4c3ed59c670b1a16e180d1 (diff) | |
| download | forums-0e8a573a7156e9318bc18fb99da6fa29e2c2c542.tar forums-0e8a573a7156e9318bc18fb99da6fa29e2c2c542.tar.gz forums-0e8a573a7156e9318bc18fb99da6fa29e2c2c542.tar.bz2 forums-0e8a573a7156e9318bc18fb99da6fa29e2c2c542.tar.xz forums-0e8a573a7156e9318bc18fb99da6fa29e2c2c542.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/includes/functions.php | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8996c0e766..39d22254a2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2188,7 +2188,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo  	$u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key;  	$template->assign_vars(array( -		'MESSAGE_TITLE'		=> (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title], +		'MESSAGE_TITLE'		=> (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang($title, 1),  		'MESSAGE_TEXT'		=> (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'],  		'YES_VALUE'			=> $user->lang['YES'], | 
