valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename unfairly prefixed get_enclosures() in feeditem

This commit is contained in:
Andrew Dolgov 2021-03-05 09:35:17 +03:00
parent c744cfe2dc
commit e8e6329040
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeditem.php
View File

@ -9,7 +9,7 @@ abstract class FeedItem {
abstract function get_comments_url(); abstract function get_comments_url();
abstract function get_comments_count(); abstract function get_comments_count();
abstract function get_categories(); abstract function get_categories();
abstract function _get_enclosures(); abstract function get_enclosures();
abstract function get_author(); abstract function get_author();
abstract function get_language(); abstract function get_language();
} }

4
classes/feeditem/atom.php
View File

@ -119,7 +119,7 @@ class FeedItem_Atom extends FeedItem_Common {
return $this->normalize_categories($cats); return $this->normalize_categories($cats);
} }
function _get_enclosures() { function get_enclosures() {
$links = $this->elem->getElementsByTagName("link"); $links = $this->elem->getElementsByTagName("link");
$encs = array(); $encs = array();
@ -138,7 +138,7 @@ class FeedItem_Atom extends FeedItem_Common {
} }
} }
$encs = array_merge($encs, parent::_get_enclosures()); $encs = array_merge($encs, parent::get_enclosures());
return $encs; return $encs;
} }

2
classes/feeditem/common.php
View File

@ -78,7 +78,7 @@ abstract class FeedItem_Common extends FeedItem {
} }
// this is common for both Atom and RSS types and deals with various media: elements // this is common for both Atom and RSS types and deals with various media: elements
function _get_enclosures() { function get_enclosures() {
$encs = []; $encs = [];
$enclosures = $this->xpath->query("media:content", $this->elem); $enclosures = $this->xpath->query("media:content", $this->elem);

4
classes/feeditem/rss.php
View File

@ -112,7 +112,7 @@ class FeedItem_RSS extends FeedItem_Common {
return $this->normalize_categories($cats); return $this->normalize_categories($cats);
} }
function _get_enclosures() { function get_enclosures() {
$enclosures = $this->elem->getElementsByTagName("enclosure"); $enclosures = $this->elem->getElementsByTagName("enclosure");
$encs = array(); $encs = array();
@ -129,7 +129,7 @@ class FeedItem_RSS extends FeedItem_Common {
array_push($encs, $enc); array_push($encs, $enc);
} }
$encs = array_merge($encs, parent::_get_enclosures()); $encs = array_merge($encs, parent::get_enclosures());
return $encs; return $encs;
} }

2
classes/rssutils.php
View File

@ -744,7 +744,7 @@ class RSSUtils {
$enclosures = array(); $enclosures = array();
$encs = $item->_get_enclosures(); $encs = $item->get_enclosures();
if (is_array($encs)) { if (is_array($encs)) {
foreach ($encs as $e) { foreach ($encs as $e) {