harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cherry-pick-9aa928ec' into 'dev'

Browse Source 
composer update simplepie/simplepie

See merge request hubzilla/core!1735
This commit is contained in:
M. Dent 2019-09-23 19:20:45 +02:00
commit 15eaa80301
6 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@ -1020,16 +1020,16 @@
}, },
{ {
"name": "simplepie/simplepie", "name": "simplepie/simplepie",
"version": "1.5.2", "version": "1.5.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/simplepie/simplepie.git", "url": "https://github.com/simplepie/simplepie.git",
"reference": "0e8fe72132dad765d25db4cabc69a91139af1263" "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/0e8fe72132dad765d25db4cabc69a91139af1263", "url": "https://api.github.com/repos/simplepie/simplepie/zipball/173663382a9346acd53df60c7ffb20689c9cf1f6",
"reference": "0e8fe72132dad765d25db4cabc69a91139af1263", "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1088,10 +1088,10 @@
"rss" "rss"
], ],
"support": { "support": {
"source": "https://github.com/simplepie/simplepie/tree/1.5.2", "source": "https://github.com/simplepie/simplepie/tree/1.5.3",
"issues": "https://github.com/simplepie/simplepie/issues" "issues": "https://github.com/simplepie/simplepie/issues"
}, },
"time": "2018-08-02T05:43:58+00:00" "time": "2019-09-22T23:21:30+00:00"
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",

14
vendor/composer/installed.json vendored
View File

@ -1049,17 +1049,17 @@
}, },
{ {
"name": "simplepie/simplepie", "name": "simplepie/simplepie",
"version": "1.5.2", "version": "1.5.3",
"version_normalized": "1.5.2.0", "version_normalized": "1.5.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/simplepie/simplepie.git", "url": "https://github.com/simplepie/simplepie.git",
"reference": "0e8fe72132dad765d25db4cabc69a91139af1263" "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/simplepie/simplepie/zipball/0e8fe72132dad765d25db4cabc69a91139af1263", "url": "https://api.github.com/repos/simplepie/simplepie/zipball/173663382a9346acd53df60c7ffb20689c9cf1f6",
"reference": "0e8fe72132dad765d25db4cabc69a91139af1263", "reference": "173663382a9346acd53df60c7ffb20689c9cf1f6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1078,7 +1078,7 @@
"ext-mbstring": "", "ext-mbstring": "",
"mf2/mf2": "Microformat module that allows for parsing HTML for microformats" "mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
}, },
"time": "2018-08-02T05:43:58+00:00", "time": "2019-09-22T23:21:30+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -1120,7 +1120,7 @@
"rss" "rss"
], ],
"support": { "support": {
"source": "https://github.com/simplepie/simplepie/tree/1.5.2", "source": "https://github.com/simplepie/simplepie/tree/1.5.3",
"issues": "https://github.com/simplepie/simplepie/issues" "issues": "https://github.com/simplepie/simplepie/issues"
} }
}, },

4
vendor/simplepie/simplepie/library/SimplePie.php vendored
View File

@ -33,7 +33,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* @package SimplePie * @package SimplePie
* @version 1.5.2 * @version 1.5.3
* @copyright 2004-2017 Ryan Parman, Geoffrey Sneddon, Ryan McCue * @copyright 2004-2017 Ryan Parman, Geoffrey Sneddon, Ryan McCue
* @author Ryan Parman * @author Ryan Parman
* @author Geoffrey Sneddon * @author Geoffrey Sneddon
@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie');
/** /**
* SimplePie Version * SimplePie Version
*/ */
define('SIMPLEPIE_VERSION', '1.5.2'); define('SIMPLEPIE_VERSION', '1.5.3');
/** /**
* SimplePie Build * SimplePie Build

2
vendor/simplepie/simplepie/library/SimplePie/Cache/File.php vendored
View File

@ -101,7 +101,7 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
*/ */
public function save($data) public function save($data)
{ {
if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location)) if (file_exists($this->name) && is_writable($this->name) || file_exists($this->location) && is_writable($this->location))
{ {
if ($data instanceof SimplePie) if ($data instanceof SimplePie)
{ {

2
vendor/simplepie/simplepie/library/SimplePie/Locator.php vendored
View File

@ -402,7 +402,7 @@ class SimplePie_Locator
{ {
break; break;
} }
if (preg_match('/(rss|rdf|atom|xml)/i', $value)) if (preg_match('/(feed|rss|rdf|atom|xml)/i', $value))
{ {
$this->checked_feeds++; $this->checked_feeds++;
$headers = array( $headers = array(

42
vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php vendored
View File

@ -145,6 +145,14 @@ class SimplePie_Parse_Date
'Παρ' => 5, 'Παρ' => 5,
'Σαβ' => 6, 'Σαβ' => 6,
'Κυρ' => 7, 'Κυρ' => 7,
// Russian
'Пн.' => 1,
'Вт.' => 2,
'Ср.' => 3,
'Чт.' => 4,
'Пт.' => 5,
'Сб.' => 6,
'Вс.' => 7,
); );
/** /**
@ -289,7 +297,33 @@ class SimplePie_Parse_Date
'Σεπ' => 9, 'Σεπ' => 9,
'Οκτ' => 10, 'Οκτ' => 10,
'Νοέ' => 11, 'Νοέ' => 11,
'Δεκ' => 12, 'Δεκ' => 12,
// Russian
'Янв' => 1,
'января' => 1,
'Фев' => 2,
'февраля' => 2,
'Мар' => 3,
'марта' => 3,
'Апр' => 4,
'апреля' => 4,
'Май' => 5,
'мая' => 5,
'Июн' => 6,
'июня' => 6,
'Июл' => 7,
'июля' => 7,
'Авг' => 8,
'августа' => 8,
'Сен' => 9,
'сентября' => 9,
'Окт' => 10,
'октября' => 10,
'Ноя' => 11,
'ноября' => 11,
'Дек' => 12,
'декабря' => 12,
); );
/** /**
@ -541,8 +575,8 @@ class SimplePie_Parse_Date
*/ */
public function __construct() public function __construct()
{ {
$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')'; $this->day_pcre = '(' . implode('|', array_keys($this->day)) . ')';
$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')'; $this->month_pcre = '(' . implode('|', array_keys($this->month)) . ')';
static $cache; static $cache;
if (!isset($cache[get_class($this)])) if (!isset($cache[get_class($this)]))
@ -690,7 +724,7 @@ class SimplePie_Parse_Date
} }
// Convert the number of seconds to an integer, taking decimals into account // Convert the number of seconds to an integer, taking decimals into account
$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7]))); $second = round((int)$match[6] + (int)$match[7] / (10 ** strlen($match[7])));
return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
} }