Merge pull request #18762 from owncloud/use-json-instead-of-unserialize

Use "json_encode" and "json_decode" instead of unserialize
owncloud · Sep 4, 2015 · c9457fd · c9457fd
2 parents 3bc287f + 36e26c6
commit c9457fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
@@ -206,7 +206,7 @@ public function getFromCache($key) {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -240,7 +240,7 @@ public function writeToCache($key, $value) {
 			return null;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, $this->configuration->ldapCacheTTL);
 	}
 

diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
@@ -161,7 +161,7 @@ public function getFromCache($key) {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -185,7 +185,7 @@ public function writeToCache($key, $value) {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, '2592000');
 	}