Fix Quick nick notifications and unread post status.

BoardTools · Jun 27, 2017 · 1ffcd11 · 1ffcd11
1 parent f31608d
commit 1ffcd11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/notification/quicknick.php b/notification/quicknick.php
@@ -56,7 +56,7 @@ public function is_available()
 	private function get_mentioned_users($xml)
 	{
 		$usernames = array();
-		if (strpos($xml, '<REF ') === false)
+		if (!preg_match('/<REF[ >]/', $xml))
 		{
 			return $usernames;
 		}
@@ -66,7 +66,8 @@ private function get_mentioned_users($xml)
 		$xpath = new \DOMXPath($dom);
 		foreach ($xpath->query('//REF') as $username)
 		{
-			$usernames[] = $username->textContent;
+			preg_match('#^\[ref(.*?)\](.+)\[\/ref\]$#ui', $username->textContent, $matches);
+			$usernames[] = $matches[2];
 		}
 
 		return $usernames;

diff --git a/styles/all/template/quickreply_style.js b/styles/all/template/quickreply_style.js
@@ -34,7 +34,7 @@
 	 * @param {jQuery} elements
 	 */
 	quickreply.style.markRead = function(elements) {
-		elements.find('.unreadpost').removeClass('unreadpost').find('.icon.icon-red').removeClass('icon-red');
+		elements.find('.unreadpost').removeClass('unreadpost').find('.icon.icon-red').removeClass('icon-red').addClass('icon-lightgray');
 	};
 
 	/**