diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-30 16:25:52 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-30 16:25:52 -0700 |
| commit | ccbc5c447df5a5284b8845d9a53f28d17d8df875 (patch) | |
| tree | ed45e1f842768e7993aff857a9edf5a36541f562 /actions | |
| parent | b10dba27982a94d73fb7f8d70cae611241871706 (diff) | |
| parent | 612a107e09619b92d4614e2f3076ddca5c65824c (diff) | |
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/disfavor.php | 2 | ||||
| -rw-r--r-- | actions/groups.php | 1 | ||||
| -rw-r--r-- | actions/twitapisearchatom.php | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/actions/disfavor.php b/actions/disfavor.php index 740f7de93..02e01d6e0 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -75,7 +75,7 @@ class DisfavorAction extends Action return; } $fave = new Fave(); - $fave->user_id = $this->id; + $fave->user_id = $user->id; $fave->notice_id = $notice->id; if (!$fave->find(true)) { $this->clientError(_('This notice is not a favorite!')); diff --git a/actions/groups.php b/actions/groups.php index b49d80f37..3d62843ed 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -115,6 +115,7 @@ class GroupsAction extends Action $groups->orderBy('created DESC'); $groups->limit($offset, $limit); + $cnt = 0; if ($groups->find()) { $gl = new GroupList($groups, null, $this); $cnt = $gl->show(); diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 708b1494d..3678213c3 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -172,6 +172,7 @@ class TwitapisearchatomAction extends TwitterapiAction } $cnt = 0; + $this->max_id = 0; if ($this->cnt > 0) { while ($notice->fetch()) { |