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.

diff --git a/lib/activity.php b/lib/activity.php
index 20e501acb41c60c56ccdcad5be9d2470cfd3b706..478fcf7ae95f1e3cf0a2f9c14c0ed12a24dee1cc 100644 (file)
--- 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);
             }
         }