3 files changed, 20 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index e5e5f1a2b8..a8abfdba5f 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -978,7 +978,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
 		foreach ($classes as $class)
 		{
 			$selected = ($class == $edit_class) ? ' selected="selected"' : '';
-			$s_classes .= '<option value="' . $class . '" title="' . $class . '"' . $selected . '>' . substr($class, 0, 40) . '</option>';
+			$s_classes .= '<option value="' . $class . '" title="' . $class . '"' . $selected . '>' . truncate_string($class, 40, false, "...") . '</option>';
 		}
 
 		$template->assign_vars(array(
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index bf1883e96f..59c3d240ce 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -686,13 +686,17 @@ function tz_select($default = '', $truncate = false)
 	{
 		if ($truncate)
 		{
-			$zone = (utf8_strlen($zone) > 70) ? utf8_substr($zone, 0, 70) . '...' : $zone;
+			$zone_trunc = truncate_string($zone, 50, false, "...");
+		} 
+		else
+		{
+			$zone_trunc = $zone;
 		}
 
 		if (is_numeric($offset))
 		{
 			$selected = ($offset == $default) ? ' selected="selected"' : '';
-			$tz_select .= '<option value="' . $offset . '"' . $selected . '>' . $zone . '</option>';
+			$tz_select .= '<option title="'.$zone.'" value="' . $offset . '"' . $selected . '>' . $zone_trunc . '</option>';
 		}
 	}
 
@@ -2737,11 +2741,12 @@ function get_preg_expression($mode)
 * Truncates string while retaining special characters if going over the max length
 * The default max length is 60 at the moment
 */
-function truncate_string($string, $max_length = 60, $allow_reply = true)
+function truncate_string($string, $max_length = 60, $allow_reply = true, $append = '')
 {
 	$chars = array();
 
 	$strip_reply = false;
+	$stripped = false;
 	if ($allow_reply && strpos($string, 'Re: ') === 0)
 	{
 		$strip_reply = true;
@@ -2756,12 +2761,18 @@ function truncate_string($string, $max_length = 60, $allow_reply = true)
 	{
 		// Cut off the last elements from the array
 		$string = implode('', array_slice($chars, 0, $max_length));
+		$stripped = true;		
 	}
 
 	if ($strip_reply)
 	{
 		$string = 'Re: ' . $string;
 	}
+	
+	if ($append != '' && $stripped)
+	{
+		$string = $string . $append;
+	}
 
 	return $string;
 }
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index c085e54143..d9afd7e623 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -128,11 +128,11 @@ class ucp_prefs
 					'DEFAULT_DATEFORMAT'	=> $config['default_dateformat'],
 					'A_DEFAULT_DATEFORMAT'	=> addslashes($config['default_dateformat']),
 
-					'S_LANG_OPTIONS'	=> language_select($data['lang']),
-					'S_STYLE_OPTIONS'	=> ($config['override_user_style']) ? '' : style_select($data['style']),
-					'S_TZ_OPTIONS'		=> tz_select($data['tz']),
-					'S_CAN_HIDE_ONLINE'	=> ($auth->acl_get('u_hideonline')) ? true : false,
-					'S_SELECT_NOTIFY'	=> ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
+					'S_LANG_OPTIONS'		=> language_select($data['lang']),
+					'S_STYLE_OPTIONS'		=> ($config['override_user_style']) ? '' : style_select($data['style']),
+					'S_TZ_OPTIONS'			=> tz_select($data['tz'], true),					
+					'S_CAN_HIDE_ONLINE'		=> ($auth->acl_get('u_hideonline')) ? true : false,
+					'S_SELECT_NOTIFY'		=> ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
 				);
 
 			break;