diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_db_mysql.php | 3 | ||||
| -rw-r--r-- | program/include/rcube_imap_generic.php | 18 |
2 files changed, 8 insertions, 13 deletions
diff --git a/program/include/rcube_db_mysql.php b/program/include/rcube_db_mysql.php index 2cdcf3021..6f0acba54 100644 --- a/program/include/rcube_db_mysql.php +++ b/program/include/rcube_db_mysql.php @@ -127,6 +127,9 @@ class rcube_db_mysql extends rcube_db $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca']; } + // Always return matching (not affected only) rows count + $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true; + return $result; } diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 52bf0e37a..651de9d97 100644 --- a/program/include/rcube_imap_generic.php +++ b/program/include/rcube_imap_generic.php @@ -3530,6 +3530,10 @@ class rcube_imap_generic */ static function uncompressMessageSet($messages) { + if (empty($messages)) { + return array(); + } + $result = array(); $messages = explode(',', $messages); @@ -3538,7 +3542,7 @@ class rcube_imap_generic $max = max($items[0], $items[1]); for ($x=$items[0]; $x<=$max; $x++) { - $result[] = $x; + $result[] = (int)$x; } unset($messages[$idx]); } @@ -3654,18 +3658,6 @@ class rcube_imap_generic } /** - * Unescapes quoted-string - * - * @param string $string IMAP string - * - * @return string String - */ - static function unEscape($string) - { - return stripslashes($string); - } - - /** * Set the value of the debugging flag. * * @param boolean $debug New value for the debugging flag. |