From d59284d42d3735e393e5e99d027136d96778600d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 5 Mar 2010 16:52:15 -0800
Subject: No need to pass in $this->limit and $this-tag

---
 actions/userrss.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actions')

diff --git a/actions/userrss.php b/actions/userrss.php
index 77bd316b2..e03eb9356 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -41,9 +41,9 @@ class UserrssAction extends Rss10Action
             return false;
         } else {
             if (!empty($this->tag)) {
-                $this->notices = $this->getTaggedNotices($this->tag, $this->limit);
+                $this->notices = $this->getTaggedNotices();
             } else {
-                $this->notices = $this->getNotices($this->limit);
+                $this->notices = $this->getNotices();
             }
             return true;
         }
-- 
cgit v1.2.3-54-g00ecf


From 0d66dc543d368092de08b49857c67248210d8d84 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 8 Mar 2010 18:06:21 -0500
Subject: an otp is a real login

---
 actions/otp.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actions')

diff --git a/actions/otp.php b/actions/otp.php
index acf84aee8..1e06603d4 100644
--- a/actions/otp.php
+++ b/actions/otp.php
@@ -126,6 +126,8 @@ class OtpAction extends Action
         $this->lt->delete();
         $this->lt = null;
 
+        common_real_login(true);
+
         if ($this->rememberme) {
             common_rememberme($this->user);
         }
-- 
cgit v1.2.3-54-g00ecf