fixes #4436 filter results in empty string if string to truncate cont…

…ains the regex limiter "/"
matomo-org · Jan 31, 2014 · b0fb017 · b0fb017
1 parent a361138
commit b0fb017
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
@@ -118,7 +118,7 @@ static public function truncate($string, $maximumNumberOfConcatenatedSMS, $appen
             $subStrSize = self::sizeOfSMSContent($subStrToTruncate, $smsContentContainsUCS2Chars);
         }
 
-        return preg_replace('/' . preg_quote($subStrToTruncate) . '$/', $appendedString, $string);
+        return preg_replace('/' . preg_quote($subStrToTruncate, '/') . '$/', $appendedString, $string);
     }
 
     static private function mb_str_split($string)

diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -92,7 +92,7 @@ public function getTruncateTestCases()
 
         $alternatedGSMx153 = str_repeat('a€', 153);
 
-        $GSMWithRegExpSpecialChars = $stdGSMx459 . '[\^$.|?*+()';
+        $GSMWithRegExpSpecialChars = $stdGSMx459 . '[\^$.|?*/+()';
 
         $UCS2x201 = str_repeat('控', 201);
 
@@ -158,7 +158,7 @@ public function getTruncateTestCases()
             array(str_repeat('控', 197) . $UCS2AppendedString, $UCS2x201 . '控', 3, $UCS2AppendedString),
 
             // UCS-2, one '控' too many, appended with standard GSM characters
-            array(str_repeat('控', 193) . $stdGSMAppendedString, $UCS2x201 . '控', 3, $stdGSMAppendedString),
+            array(str_repeat('控', 193) . $stdGSMAppendedString, $UCS2x201 . '控', 3, $stdGSMAppendedString)
         );
     }