summaryrefslogtreecommitdiff
path: root/lib/activity.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-20 07:19:54 -0500
committerEvan Prodromou <evan@status.net>2010-03-20 07:19:54 -0500
commit65c8dc313c646a4ad4e16bc470b9ac795ca197dd (patch)
tree53a332b24961fb6003cad02016ff746c04c14ce6 /lib/activity.php
parentc0f657200165faeb1ddd60230d0dc2ca2f404cb4 (diff)
rename $rss to $channel to prevent misunderstanding
RSS feeds have the format <rss><channel><item/><item/><item/></channel></rss>. The element named $rss was actually the <channel> element, so I renamed the variable so I wouldn't hurt my head.
Diffstat (limited to 'lib/activity.php')
-rw-r--r--lib/activity.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/activity.php b/lib/activity.php
index 20e501acb..478fcf7ae 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -1329,7 +1329,7 @@ class Activity
}
}
- function _fromRssItem($item, $rss)
+ function _fromRssItem($item, $channel)
{
$verbEl = $this->_child($item, self::VERB);
@@ -1354,8 +1354,8 @@ class Activity
$dcCreatorEl = $this->_child($item, self::CREATOR, self::DC);
if (!empty($dcCreatorEl)) {
$this->actor = ActivityObject::fromDcCreator($dcCreatorEl);
- } else if (!empty($rss)) {
- $this->actor = ActivityObject::fromRssChannel($rss);
+ } else if (!empty($channel)) {
+ $this->actor = ActivityObject::fromRssChannel($channel);
}
}