0.4.8

martec · martec · commit 32b1cfeded84 · 2023-05-14T18:51:01.000+09:00
diff --git a/re_version_file.json b/re_version_file.json
@@ -1,9 +1,9 @@
 {
 	"stable": {
 		"0.4": {
-			"current": "0.4.7",
+			"current": "0.4.8",
 			"announcement": "https://www.phpbb.com/community/viewtopic.php?f=456&t=2427126",
-			"download": "https://github.com/martec/Rin-Editor_for_phpBB/archive/0.4.7-beta.zip",
+			"download": "https://github.com/martec/Rin-Editor_for_phpBB/archive/0.4.8-beta.zip",
 			"eol": null,
 			"security": false
 		}
diff --git a/rin/editor/composer.json b/rin/editor/composer.json
@@ -3,8 +3,8 @@
   "type": "phpbb-extension",
   "description": "Rin Editor for phpBB",
   "homepage": "https://github.com/martec/Rin-Editor_for_phpBB",
-  "version": "0.4.7",
-  "time": "2023-05-03",
+  "version": "0.4.8",
+  "time": "2023-05-14",
   "license": "GPL-2.0-only",
   "authors": [
 	{
diff --git a/rin/editor/event/main_listener.php b/rin/editor/event/main_listener.php
@@ -84,7 +84,11 @@ public function rce_quick_reply($event)
 	{
 		if ($this->config['RCE_quickreply'] && $this->request->is_ajax() && $event['mode'] == 'quote')
 		{
-			$data = array('quick_reply_msg' => $event['post_data']['post_text']);
+			$post_data = $event['post_data'];
+			$post_data['post_text'] = preg_replace('#\[mention\](.*?)\[\/mention\]#uis', '@\\1', $post_data['post_text']);
+			$post_data['post_text'] = preg_replace('#\[smention u=([0-9]+)\](.*?)\[\/smention\]#uis', '@\\2', $post_data['post_text']);
+			$post_data['post_text'] = preg_replace('#\[smention g=([0-9]+)\](.*?)\[\/smention\]#uis', '@\\2', $post_data['post_text']);
+			$data = array('quick_reply_msg' => $post_data['post_text']);
 			$json = new \phpbb\json_response();
 			$json->send($data);
 		}
diff --git a/rin/editor/styles/all/template/js/automention.js b/rin/editor/styles/all/template/js/automention.js

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"stable": {`
`3`	`3`	`"0.4": {`
`4`		`- "current": "0.4.7",`
	`4`	`+ "current": "0.4.8",`
`5`	`5`	`"announcement": "https://www.phpbb.com/community/viewtopic.php?f=456&t=2427126",`
`6`		`- "download": "https://github.com/martec/Rin-Editor_for_phpBB/archive/0.4.7-beta.zip",`
	`6`	`+ "download": "https://github.com/martec/Rin-Editor_for_phpBB/archive/0.4.8-beta.zip",`
`7`	`7`	`"eol": null,`
`8`	`8`	`"security": false`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,11 @@ public function rce_quick_reply($event)`
`84`	`84`	`{`
`85`	`85`	`if ($this->config['RCE_quickreply'] && $this->request->is_ajax() && $event['mode'] == 'quote')`
`86`	`86`	`{`
`87`		`- $data = array('quick_reply_msg' => $event['post_data']['post_text']);`
	`87`	`+ $post_data = $event['post_data'];`
	`88`	`+ $post_data['post_text'] = preg_replace('#\[mention\](.*?)\[\/mention\]#uis', '@\\1', $post_data['post_text']);`
	`89`	`+ $post_data['post_text'] = preg_replace('#\[smention u=([0-9]+)\](.*?)\[\/smention\]#uis', '@\\2', $post_data['post_text']);`
	`90`	`+ $post_data['post_text'] = preg_replace('#\[smention g=([0-9]+)\](.*?)\[\/smention\]#uis', '@\\2', $post_data['post_text']);`
	`91`	`+ $data = array('quick_reply_msg' => $post_data['post_text']);`
`88`	`92`	`$json = new \phpbb\json_response();`
`89`	`93`	`$json->send($data);`
`90`	`94`	`}`