diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
| commit | adfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch) | |
| tree | e14ec0cc5161cfd5cc321eaaa5b8eed07df952de /actions/twitapidirect_messages.php | |
| parent | 1a126032efbcb265a59f4d682bd072251f857c97 (diff) | |
| parent | 265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
Diffstat (limited to 'actions/twitapidirect_messages.php')
| -rw-r--r-- | actions/twitapidirect_messages.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php index 7101db8df..d2dbdb619 100644 --- a/actions/twitapidirect_messages.php +++ b/actions/twitapidirect_messages.php @@ -43,7 +43,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction $count = $this->arg('count'); $since = $this->arg('since'); $since_id = $this->arg('since_id'); - $before_id = $this->arg('before_id'); + $max_id = $this->arg('max_id'); $page = $this->arg('page'); @@ -74,8 +74,8 @@ class Twitapidirect_messagesAction extends TwitterapiAction $link = $server . $user->nickname . '/outbox'; } - if ($before_id) { - $message->whereAdd("id < $before_id"); + if ($max_id) { + $message->whereAdd("id <= $max_id"); } if ($since_id) { |