From e81c05937e847f68b9dfcc4bc38fe6d978c5e4f8 Mon Sep 17 00:00:00 2001 From: Jan Kozak Date: Fri, 22 Mar 2013 14:05:35 +0100 Subject: [PATCH] Update Memcache.php this shouldn't get commited, don't you test it? --- library/SimplePie/Cache/Memcache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/SimplePie/Cache/Memcache.php b/library/SimplePie/Cache/Memcache.php index 46cf05a52..87cbe6f1b 100644 --- a/library/SimplePie/Cache/Memcache.php +++ b/library/SimplePie/Cache/Memcache.php @@ -95,7 +95,7 @@ public function __construct($location, $name, $type) 'prefix' => 'simplepie_', ), ); - $this->options = SimplePie_Misc::merge_array_recursive($this->options, SimplePie_Cache::parse_URL($location); + $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location)); $this->name = $this->options['extras']['prefix'] . md5("$name:$type");