diff options
| -rw-r--r-- | program/lib/Roundcube/rcube_db.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php index 645b85adb..2d1e32e24 100644 --- a/program/lib/Roundcube/rcube_db.php +++ b/program/lib/Roundcube/rcube_db.php @@ -835,9 +835,14 @@ class rcube_db */ public static function decode($input, $serialized = false) { + // use Base64 encoding to workaround issues with invalid + // or null characters in serialized string (#1489142) if ($serialized) { - // use Base64 encoding to workaround issues with invalid - // or null characters in serialized string (#1489142) + // Keep backward compatybility where base64 wasn't used + if (strpos(substr($input, 0, 16), ':') !== false) { + return self::decode(@unserialize($input)); + } + return @unserialize(base64_decode($input)); } |