Merge remote-tracking branch 'upstream/master' into 1603-fromgplus-keywords

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 07fa58ad1b3332ab279fbec946460ab502b249b2..8f023dfeb4608f66b5bf38bb9e468cde6d1136f1 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -771,8 +771,10 @@ function twitter_fetchtimeline($a, $uid) {
 
        if (count($posts)) {
            foreach ($posts as $post) {
-               if ($post->id_str > $lastid)
+               if ($post->id_str > $lastid) {
                        $lastid = $post->id_str;
+                       set_pconfig($uid, 'twitter', 'lastid', $lastid);
+               }
 
                if ($first_time)
                        continue;
@@ -1698,8 +1700,10 @@ function twitter_fetchhometimeline($a, $uid) {
 
        if (count($posts)) {
                foreach ($posts as $post) {
-                       if ($post->id_str > $lastid)
+                       if ($post->id_str > $lastid) {
                                $lastid = $post->id_str;
+                               set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+                       }
 
                        if ($first_time)
                                continue;