Merge pull request #176 from Oldiesmann/release-2.1

! Improve option for displaying full editor on Quick Reply

Sources/Display.php

@@ -1099,7 +1099,7 @@ function Display()
 		checkSubmitOnce('register');
 		$context['name'] = isset($_SESSION['guest_name']) ? $_SESSION['guest_name'] : '';
 		$context['email'] = isset($_SESSION['guest_email']) ? $_SESSION['guest_email'] : '';
-		if ($options['display_quick_reply'] == 3 && $context['can_reply'])
+		if (!empty($options['use_editor_quick_reply']) && $context['can_reply'])
 		{
 			// Needed for the editor and message icons.
 			require_once($sourcedir . '/Subs-Editor.php');

Themes/default/Display.template.php

@@ -831,7 +831,7 @@ function template_main()
 						sImageCollapsed: "collapse.png",
 						sImageExpanded: "expand.png",
 						sJumpAnchor: "quickreply",
-						bIsFull: ', !empty($options['display_quick_reply']) && $options['display_quick_reply'] > 2 ? 'true' : 'false', '
+						bIsFull: ', !empty($options['use_editor_quick_reply']) ? 'true' : 'false', '
 					});';
 
 	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1 && $context['can_remove_post'])

Themes/default/Settings.template.php

@@ -131,10 +131,14 @@ function template_options()
 				0 => $txt['display_quick_reply1'],
 				1 => $txt['display_quick_reply2'],
 				2 => $txt['display_quick_reply3'],
-				3 => $txt['display_quick_reply4']
 			),
 			'default' => true,
 		),
+        array(
+            'id' => 'use_editor_quick_reply',
+            'label' => $txt['use_editor_quick_reply'],
+            'default' => true,
+        ),
 		array(
 			'id' => 'display_quick_mod',
 			'label' => $txt['display_quick_mod'],

Themes/default/languages/Profile.english.php

@@ -289,7 +289,7 @@ $txt['display_quick_reply'] = 'Use quick reply on topic display: ';
 $txt['display_quick_reply1'] = 'don\'t show at all';
 $txt['display_quick_reply2'] = 'show, off by default';
 $txt['display_quick_reply3'] = 'show, on by default';
-$txt['display_quick_reply4'] = 'show full editor, on by default';
+$txt['use_editor_quick_reply'] = 'Use full editor in Quick Reply';
 $txt['display_quick_mod'] = 'Show quick-moderation as ';
 $txt['display_quick_mod_none'] = 'don\'t show.';
 $txt['display_quick_mod_check'] = 'checkboxes.';