Mercurial > hg > rc2

diff program/lib/Roundcube/rcube_result_thread.php @ 14:abddb304201f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
continue slowly cleaning up after move to 8.3
author Charlie Root
date Sat, 06 Sep 2025 08:16:01 -0400
parents 5039cc34571f
children b6a96bdd6b29
line wrap: on
line diff
--- a/program/lib/Roundcube/rcube_result_thread.php	Sat Sep 06 08:12:41 2025 -0400
+++ b/program/lib/Roundcube/rcube_result_thread.php	Sat Sep 06 08:16:01 2025 -0400
@@ -207,8 +207,9 @@
         $this->meta          = array();
         $this->meta['count'] = 0;
 
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+			       $start)) != false|| ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);
@@ -439,8 +440,9 @@
         // in memory at a time
 
         // Assign roots
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+				$start)) != false || ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);
@@ -466,8 +468,9 @@
         $result = array_fill_keys($result, null);
         $start = 0;
 
-        while (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT, $start))
-            || ($start < $datalen && ($pos = $datalen))
+        while ($start < $datalen &&
+	       (($pos = @strpos($this->raw_data, self::SEPARATOR_ELEMENT,
+			       $start)) != false || ($pos = $datalen))
         ) {
             $len   = $pos - $start;
             $elem  = substr($this->raw_data, $start, $len);