Move "cursor" position on \r\n sequence after single-dot in a line (#…

…5838)
roundcube · Jul 3, 2017 · e31d87b · e31d87b
1 parent 0abd84d
commit e31d87b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -1277,9 +1277,12 @@ static function tokenize($str, $num = 0, &$position = 0)
                             $text    .= substr($str, $position, $pos - $position);
                             $position = $pos + 2;
 
-                            if ($str[$position] == "\n"
-                                || ($str[$position] == "\r" && $str[$position + 1] == "\n")
-                            ) {
+                            if ($str[$position] == "\n") {
+                                break;
+                            }
+
+                            if ($str[$position] == "\r" && $str[$position + 1] == "\n") {
+                                $position++;
                                 break;
                             }