From ade634d831ddf8c04041cc2e22f1d0f01f30f295 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Thu, 18 May 2017 14:18:55 +0100 Subject: [PATCH] bugfixes --- src/Threaded.php | 8 -------- src/Volatile.php | 8 -------- src/danog/MadelineProto/Serialization.php | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Threaded.php b/src/Threaded.php index 2f946a04..e381790c 100644 --- a/src/Threaded.php +++ b/src/Threaded.php @@ -52,14 +52,6 @@ if (!extension_loaded('pthreads')) { } } - if (is_array($value)) { - $safety = - new Volatile(); - $safety->merge( - $this->convertToVolatile($value)); - $value = $safety; - } - return $this->{$offset} = $value; } diff --git a/src/Volatile.php b/src/Volatile.php index cac9a337..8a4cd85b 100644 --- a/src/Volatile.php +++ b/src/Volatile.php @@ -9,14 +9,6 @@ if (!extension_loaded('pthreads')) { $offset = count((array) $this); } - if (is_array($value)) { - $safety = - new self(); - $safety->merge( - $this->convertToVolatile($value)); - $value = $safety; - } - return $this->{$offset} = $value; } } diff --git a/src/danog/MadelineProto/Serialization.php b/src/danog/MadelineProto/Serialization.php index 4b23ce7e..20490f43 100644 --- a/src/danog/MadelineProto/Serialization.php +++ b/src/danog/MadelineProto/Serialization.php @@ -63,7 +63,7 @@ class Serialization class_exists('\Volatile'); \danog\MadelineProto\Logger::class_exists(); try { - $unserialized = \danog\MadelineProto\Logger::$has_thread ? \danog\Serialization::unserialize($unserialized) : unserialize($unserialized); + $unserialized = \danog\Serialization::unserialize($unserialized); } catch (Bug74586Exception $e) { $unserialized = \danog\Serialization::unserialize($unserialized); } catch (Exception $e) {