diff options
author | Sarven Capadisli <csarven@status.net> | 2010-03-02 15:26:27 -0500 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-03-02 15:26:27 -0500 |
commit | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (patch) | |
tree | a5847af8504385223110b579c9dab702cd766afa /lib/apiaction.php | |
parent | 4113f28851020509163a31ab20658429d86c3134 (diff) | |
parent | 72460091ddc6763cb8d62f9d865390ea4973dd44 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/apiaction.php')
-rw-r--r-- | lib/apiaction.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index 2af150ab9..8049c0901 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -63,7 +63,6 @@ class ApiAction extends Action var $count = null; var $max_id = null; var $since_id = null; - var $since = null; var $access = self::READ_ONLY; // read (default) or read-write @@ -85,7 +84,10 @@ class ApiAction extends Action $this->count = (int)$this->arg('count', 20); $this->max_id = (int)$this->arg('max_id', 0); $this->since_id = (int)$this->arg('since_id', 0); - $this->since = $this->arg('since'); + + if ($this->arg('since')) { + $this->clientError(_("since parameter is disabled for performance; use since_id"), 403); + } return true; } @@ -1325,8 +1327,6 @@ class ApiAction extends Action case 'max_id': $max_id = (int)$this->args['max_id']; return ($max_id < 1) ? 0 : $max_id; - case 'since': - return strtotime($this->args['since']); default: return parent::arg($key, $def); } |