Changeset 47733 for trunk/src/wp-includes/SimplePie/Cache/Memcache.php

Timestamp:

05/01/2020 02:24:42 PM (4 years ago)

Author:

desrosj

Message:

External Libraries: Update the SimplePie library to the latest version (1.5.5).

This brings SimplePie in sync with the most up to date version, 1.5.5.

This update brings many bug fixes, small enhancements, and PHP compatibility fixes for newer versions of PHP.

For a full list of changes, see ​https://github.com/simplepie/simplepie/blob/master/CHANGELOG.md#155-may-1-2020.

Props dshanske, slushman, etruel, wpshades, dmenard, desrosj, hareesh-pillai, stevenkword, jrf, Ipstenu, johnbillion.
Fixes #36669.

File:

• trunk/src/wp-includes/SimplePie/Cache/Memcache.php (modified) (5 diffs)

trunk/src/wp-includes/SimplePie/Cache/Memcache.php

@@ -6 +6 @@
  * Takes the hard work out of managing a complete RSS/Atom solution.
  *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
  * All rights reserved.
  *
@@ -34 +34 @@
  *
  * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
  * @author Ryan Parman
- * @author Geoffrey Sneddon
+ * @author Sam Sneddon
  * @author Ryan McCue
  * @link http://simplepie.org/ SimplePie
@@ -96 +95 @@
             ),
         );
-        $parsed = SimplePie_Cache::parse_URL($location);
-        $this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host'];
-        $this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port'];
-        $this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']);
+        $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
         $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
 
@@ -148 +145 @@
         if ($data !== false)
         {
-            // essentially ignore the mtime because Memcache expires on it's own
+            // essentially ignore the mtime because Memcache expires on its own
             return time();
         }
@@ -166 +163 @@
         if ($data !== false)
         {
-            return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->duration);
+            return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
         }