Fix Ctrl+Enter functionality.

Author: lavigor

acp/quickreply_module.php

@@ -16,8 +16,7 @@ class quickreply_module
 
 	public function main($id, $mode)
 	{
-		global $cache, $config, $db, $user, $auth, $template, $request;
-		global $phpbb_root_path, $phpEx, $phpbb_admin_path, $phpbb_container;
+		global $config, $user, $template, $request;
 
 		$this->page_title = 'ACP_QUICKREPLY';
 		$this->tpl_name = 'acp_quickreply';
@@ -63,13 +62,22 @@ public function main($id, $mode)
 			),
 		);
 
+		/**
+		 * We need to disable this feature in phpBB 3.1.9 and higher
+		 * as it has been added to the core.
+		 */
+		if (version_compare($config['version'], '3.1.8', '>'))
+		{
+			unset($display_vars['qr_ctrlenter']);
+		}
+
 		if (isset($display_vars['lang']))
 		{
 			$user->add_lang($display_vars['lang']);
 		}
 
 		$this->new_config = $config;
-		$cfg_array = ($request->is_set('config')) ? utf8_normalize_nfc($request->variable('config', array('' => ''), true)) : $this->new_config;
+		$cfg_array = ($request->is_set('config')) ? $request->variable('config', array('' => ''), true) : $this->new_config;
 		$error = array();
 
 		// We validate the complete config if wished

event/listener_helper.php

@@ -287,4 +287,29 @@ public function assign_template_variables_for_qr($forum_id)
 			'S_ABBC3_INSTALLED'  => $this->phpbb_extension_manager->is_enabled('vse/abbc3'),
 		));
 	}
+
+	/**
+	 * Detects whether Ctrl+Enter feature is enabled in QuickReply extension.
+	 * We need to disable this feature in phpBB 3.1.9 and higher
+	 * as it has been added to the core.
+	 *
+	 * @deprecated 1.0.2 added only for backwards compatibility reasons
+	 * @return bool
+	 */
+	public function qr_ctrlenter_enabled()
+	{
+		$qr_ctrlenter = $this->config['qr_ctrlenter'];
+		if ($qr_ctrlenter)
+		{
+			if (version_compare($this->config['version'], '3.1.8', '>'))
+			{
+				$this->config->set('qr_ctrlenter', 0);
+			}
+			else
+			{
+				return $qr_ctrlenter;
+			}
+		}
+		return false;
+	}
 }