From 5d9cb727749eae3770337fc7f086b79d961254ce Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 30 Oct 2019 09:34:55 +1100 Subject: [PATCH] Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader.php CRM/Queue and CRM/Utils/Cache --- CRM/Core/BAO/Cache.php | 4 ++-- CRM/Core/BAO/ConfigSetting.php | 4 ++-- CRM/Extension/ClassLoader.php | 2 +- CRM/Queue/Queue/Memory.php | 4 ++-- CRM/Queue/Queue/Sql.php | 4 ++-- CRM/Queue/Runner.php | 2 +- CRM/Utils/Array.php | 2 +- CRM/Utils/Cache/APCcache.php | 2 +- CRM/Utils/Cache/ArrayCache.php | 4 ++-- CRM/Utils/Cache/ArrayDecorator.php | 2 +- CRM/Utils/Cache/Memcache.php | 2 +- CRM/Utils/Cache/Memcached.php | 2 +- CRM/Utils/Cache/Redis.php | 2 +- CRM/Utils/Cache/SqlGroup.php | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php index 4ef618f30d..e71e24e368 100644 --- a/CRM/Core/BAO/Cache.php +++ b/CRM/Core/BAO/Cache.php @@ -444,10 +444,10 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { // Upgrade support -- old records (serialize) always have this punctuation, // and new records (base64) never do. if (strpos($string, ':') !== FALSE || strpos($string, ';') !== FALSE) { - return CRM_Utils_String::unserialize($string); + return unserialize($string); } else { - return CRM_Utils_String::unserialize(base64_decode($string)); + return unserialize(base64_decode($string)); } } diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index c30f7ae1ce..8919a6d790 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -63,7 +63,7 @@ class CRM_Core_BAO_ConfigSetting { $domain->id = CRM_Core_Config::domainID(); $domain->find(TRUE); if ($domain->config_backend) { - $params = array_merge(CRM_Utils_String::unserialize($domain->config_backend), $params); + $params = array_merge(unserialize($domain->config_backend), $params); } $params = CRM_Core_BAO_ConfigSetting::filterSkipVars($params); @@ -106,7 +106,7 @@ class CRM_Core_BAO_ConfigSetting { $domain->id = CRM_Core_Config::domainID(); $domain->find(TRUE); if ($domain->config_backend) { - $defaults = CRM_Utils_String::unserialize($domain->config_backend); + $defaults = unserialize($domain->config_backend); if ($defaults === FALSE || !is_array($defaults)) { $defaults = []; return FALSE; diff --git a/CRM/Extension/ClassLoader.php b/CRM/Extension/ClassLoader.php index d0845911e0..4569f6c2e4 100644 --- a/CRM/Extension/ClassLoader.php +++ b/CRM/Extension/ClassLoader.php @@ -89,7 +89,7 @@ class CRM_Extension_ClassLoader { $loader = $this->buildClassLoader(); $ser = serialize($loader); file_put_contents($file, - sprintf("register(); diff --git a/CRM/Queue/Queue/Memory.php b/CRM/Queue/Queue/Memory.php index 99b92959ee..0c840c1c36 100644 --- a/CRM/Queue/Queue/Memory.php +++ b/CRM/Queue/Queue/Memory.php @@ -137,7 +137,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue { $item = new stdClass(); $item->id = $id; - $item->data = CRM_Utils_String::unserialize($data); + $item->data = unserialize($data); return $item; } else { @@ -166,7 +166,7 @@ class CRM_Queue_Queue_Memory extends CRM_Queue_Queue { $item = new stdClass(); $item->id = $id; - $item->data = CRM_Utils_String::unserialize($data); + $item->data = unserialize($data); return $item; } // nothing in queue diff --git a/CRM/Queue/Queue/Sql.php b/CRM/Queue/Queue/Sql.php index dc9474c1a1..28f13506de 100644 --- a/CRM/Queue/Queue/Sql.php +++ b/CRM/Queue/Queue/Sql.php @@ -160,7 +160,7 @@ class CRM_Queue_Queue_Sql extends CRM_Queue_Queue { # $dao->submit_time = date('YmdHis', strtotime($dao->submit_time)); # $dao->release_time = date('YmdHis', $nowEpoch + $lease_time); # $dao->save(); - $dao->data = CRM_Utils_String::unserialize($dao->data); + $dao->data = unserialize($dao->data); $result = $dao; } @@ -196,7 +196,7 @@ class CRM_Queue_Queue_Sql extends CRM_Queue_Queue { '1' => [date('YmdHis', $nowEpoch + $lease_time), 'String'], '2' => [$dao->id, 'Integer'], ]); - $dao->data = CRM_Utils_String::unserialize($dao->data); + $dao->data = unserialize($dao->data); return $dao; } } diff --git a/CRM/Queue/Runner.php b/CRM/Queue/Runner.php index 48906b6abb..fa2817e713 100644 --- a/CRM/Queue/Runner.php +++ b/CRM/Queue/Runner.php @@ -85,7 +85,7 @@ class CRM_Queue_Runner { */ public static function instance($qrid) { if (!empty($_SESSION['queueRunners'][$qrid])) { - return CRM_Utils_String::unserialize($_SESSION['queueRunners'][$qrid]); + return unserialize($_SESSION['queueRunners'][$qrid]); } else { return NULL; diff --git a/CRM/Utils/Array.php b/CRM/Utils/Array.php index b28f677703..7dd32cd4be 100644 --- a/CRM/Utils/Array.php +++ b/CRM/Utils/Array.php @@ -499,7 +499,7 @@ class CRM_Utils_Array { * The input array with duplicate values removed. */ public static function crmArrayUnique($array) { - $result = array_map("CRM_Utils_String::unserialize", array_unique(array_map("serialize", $array))); + $result = array_map("unserialize", array_unique(array_map("serialize", $array))); foreach ($result as $key => $value) { if (is_array($value)) { $result[$key] = self::crmArrayUnique($value); diff --git a/CRM/Utils/Cache/APCcache.php b/CRM/Utils/Cache/APCcache.php index 80c3ac6a2b..187da7edb8 100644 --- a/CRM/Utils/Cache/APCcache.php +++ b/CRM/Utils/Cache/APCcache.php @@ -145,7 +145,7 @@ class CRM_Utils_Cache_APCcache implements CRM_Utils_Cache_Interface { } private function reobjectify($value) { - return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value; + return is_object($value) ? unserialize(serialize($value)) : $value; } } diff --git a/CRM/Utils/Cache/ArrayCache.php b/CRM/Utils/Cache/ArrayCache.php index de44d73b64..c83f3f1f4e 100644 --- a/CRM/Utils/Cache/ArrayCache.php +++ b/CRM/Utils/Cache/ArrayCache.php @@ -121,12 +121,12 @@ class CRM_Utils_Cache_ArrayCache implements CRM_Utils_Cache_Interface { private function reobjectify($value) { if (is_object($value)) { - return CRM_Utils_String::unserialize(serialize($value)); + return unserialize(serialize($value)); } if (is_array($value)) { foreach ($value as $p) { if (is_object($p)) { - return CRM_Utils_String::unserialize(serialize($value)); + return unserialize(serialize($value)); } } } diff --git a/CRM/Utils/Cache/ArrayDecorator.php b/CRM/Utils/Cache/ArrayDecorator.php index 0f75d84a1a..86ac79728a 100644 --- a/CRM/Utils/Cache/ArrayDecorator.php +++ b/CRM/Utils/Cache/ArrayDecorator.php @@ -137,7 +137,7 @@ class CRM_Utils_Cache_ArrayDecorator implements CRM_Utils_Cache_Interface { } private function reobjectify($value) { - return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value; + return is_object($value) ? unserialize(serialize($value)) : $value; } } diff --git a/CRM/Utils/Cache/Memcache.php b/CRM/Utils/Cache/Memcache.php index 64db5ae9f1..511663792e 100644 --- a/CRM/Utils/Cache/Memcache.php +++ b/CRM/Utils/Cache/Memcache.php @@ -149,7 +149,7 @@ class CRM_Utils_Cache_Memcache implements CRM_Utils_Cache_Interface { public function get($key, $default = NULL) { CRM_Utils_Cache::assertValidKey($key); $result = $this->_cache->get($this->getTruePrefix() . $key); - return ($result === FALSE) ? $default : CRM_Utils_String::unserialize($result); + return ($result === FALSE) ? $default : unserialize($result); } /** diff --git a/CRM/Utils/Cache/Memcached.php b/CRM/Utils/Cache/Memcached.php index 6e2a1332a5..fd3aee39c2 100644 --- a/CRM/Utils/Cache/Memcached.php +++ b/CRM/Utils/Cache/Memcached.php @@ -167,7 +167,7 @@ class CRM_Utils_Cache_Memcached implements CRM_Utils_Cache_Interface { $result = $this->_cache->get($key); switch ($this->_cache->getResultCode()) { case Memcached::RES_SUCCESS: - return CRM_Utils_String::unserialize($result); + return unserialize($result); case Memcached::RES_NOTFOUND: return $default; diff --git a/CRM/Utils/Cache/Redis.php b/CRM/Utils/Cache/Redis.php index b3b01fee25..f7c8435f79 100644 --- a/CRM/Utils/Cache/Redis.php +++ b/CRM/Utils/Cache/Redis.php @@ -153,7 +153,7 @@ class CRM_Utils_Cache_Redis implements CRM_Utils_Cache_Interface { public function get($key, $default = NULL) { CRM_Utils_Cache::assertValidKey($key); $result = $this->_cache->get($this->_prefix . $key); - return ($result === FALSE) ? $default : CRM_Utils_String::unserialize($result); + return ($result === FALSE) ? $default : unserialize($result); } /** diff --git a/CRM/Utils/Cache/SqlGroup.php b/CRM/Utils/Cache/SqlGroup.php index b206c1b04c..840886c65e 100644 --- a/CRM/Utils/Cache/SqlGroup.php +++ b/CRM/Utils/Cache/SqlGroup.php @@ -184,7 +184,7 @@ class CRM_Utils_Cache_SqlGroup implements CRM_Utils_Cache_Interface { } private function reobjectify($value) { - return is_object($value) ? CRM_Utils_String::unserialize(serialize($value)) : $value; + return is_object($value) ? unserialize(serialize($value)) : $value; } /** -- 2.25.1