Correctly treat smileys with square parentheses at start of message

Author: marc1706

src/Nickvergessen/TrimMessage/PhpbbBbcodes.php

@@ -498,7 +498,7 @@ public function filter_bbcode_tag($bbcode_tag, $strip_information = true, $strip
 	protected function replace_square_brackets_in_smilies()
 	{
 		// Replace all [ that are inside of <> because they belong to smilies
-		if (utf8_strpos($this->message, '<'))
+		if (utf8_strpos($this->message, '<') !== false)
 		{
 			$this->bracket_replacement = '{' . md5($this->message) . '}';
 			while (utf8_strpos($this->message, $this->bracket_replacement) !== false)

src/Nickvergessen/TrimMessage/Tests/TrimTest.php

@@ -46,7 +46,7 @@ public function trim_message_data()
 				'bbcode_uid'	=> '2sda49fx',
 			),
 			array(
-				'message'		=> '<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h',
+				'message'		=> '<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h foo bar',
 				'bbcode_uid'	=> '2sda49fx',
 			),
 		);
@@ -208,8 +208,12 @@ public function trim_message_data()
 			 * Breaking withing smiley with dot and square parentheses
 			 */
 			array(
-				'message_set'	=> 8, 'length' => 12, 'trimmed' => false,
-				'expected'		=> '<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h',
+				'message_set'	=> 8, 'length' => 20, 'trimmed' => false,
+				'expected'		=> '<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h foo bar',
+			),
+			array(
+				'message_set'	=> 8, 'length' => 10, 'trimmed' => true,
+				'expected'		=> '<!-- s[foo.bar] --><img src="{SMILIES_PATH}/icon_e_geek.gif" alt="[foo.bar]" title="Geek" /><!-- s[foo.bar] -->h [...]',
 			),
 		);