--- a/wp/wp-includes/SimplePie/Enclosure.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/SimplePie/Enclosure.php Tue Dec 15 13:49:49 2020 +0100
@@ -5,7 +5,7 @@
* A PHP-Based RSS and Atom Feed Framework.
* 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.
*
* Redistribution and use in source and binary forms, with or without modification, are
@@ -33,10 +33,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* @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
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
@@ -283,10 +282,8 @@
{
return $this->bitrate;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -302,10 +299,8 @@
{
return $captions[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -319,10 +314,8 @@
{
return $this->captions;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -338,10 +331,8 @@
{
return $categories[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -355,10 +346,8 @@
{
return $this->categories;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -372,10 +361,8 @@
{
return $this->channels;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -389,10 +376,8 @@
{
return $this->copyright;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -408,10 +393,8 @@
{
return $credits[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -425,10 +408,8 @@
{
return $this->credits;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -442,16 +423,14 @@
{
return $this->description;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
* Get the duration of the enclosure
*
- * @param string $convert Convert seconds into hh:mm:ss
+ * @param bool $convert Convert seconds into hh:mm:ss
* @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
*/
public function get_duration($convert = false)
@@ -463,15 +442,11 @@
$time = SimplePie_Misc::time_hms($this->duration);
return $time;
}
- else
- {
- return $this->duration;
- }
+
+ return $this->duration;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -485,10 +460,8 @@
{
return $this->expression;
}
- else
- {
- return 'full';
- }
+
+ return 'full';
}
/**
@@ -520,10 +493,8 @@
{
return $this->framerate;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -550,10 +521,8 @@
{
return $hashes[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -567,10 +536,8 @@
{
return $this->hashes;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -584,10 +551,8 @@
{
return $this->height;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -602,10 +567,8 @@
{
return $this->lang;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -621,10 +584,8 @@
{
return $keywords[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -638,10 +599,8 @@
{
return $this->keywords;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -655,10 +614,8 @@
{
return $this->length;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -672,10 +629,8 @@
{
return urldecode($this->link);
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -690,10 +645,8 @@
{
return $this->medium;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -708,10 +661,8 @@
{
return $this->player;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -727,10 +678,8 @@
{
return $ratings[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -744,10 +693,8 @@
{
return $this->ratings;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -763,10 +710,8 @@
{
return $restrictions[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -780,10 +725,8 @@
{
return $this->restrictions;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -797,10 +740,8 @@
{
return $this->samplingrate;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -815,10 +756,8 @@
{
return round($length/1048576, 2);
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -834,10 +773,8 @@
{
return $thumbnails[$key];
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -851,10 +788,8 @@
{
return $this->thumbnails;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -868,10 +803,8 @@
{
return $this->title;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -886,10 +819,8 @@
{
return $this->type;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -903,10 +834,8 @@
{
return $this->width;
}
- else
- {
- return null;
- }
+
+ return null;
}
/**
@@ -942,7 +871,7 @@
* - `height` (integer): The height of the embedded media. Accepts any
* numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
* and it is recommended that you use this default.
- * - `loop` (boolean): Do you want the media to loop when its done?
+ * - `loop` (boolean): Do you want the media to loop when it's done?
* Defaults to `false`.
* - `mediaplayer` (string): The location of the included
* `mediaplayer.swf` file. This allows for the playback of Flash Video
@@ -1366,15 +1295,10 @@
{
return 'mp3';
}
- else
- {
- return null;
- }
+
+ return null;
}
- else
- {
- return $type;
- }
+
+ return $type;
}
}
-