diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-04 06:07:28 -0800 |
| commit | b218aee94e581230e1efa14d4ae1a19756986ddf (patch) | |
| tree | a832ddf3b4322b520fd20c4d8ea2d31720c3679b /actions/oauthconnectionssettings.php | |
| parent | 358556057a87c0cb9291223a2026782e6548ff2e (diff) | |
| parent | 14d7f4a598d0e24467fe3eafd9a02b0e651edad8 (diff) | |
Merge commit 'origin/testing' into 0.9.x
Conflicts:
lib/action.php
lib/adminpanelaction.php
Diffstat (limited to 'actions/oauthconnectionssettings.php')
| -rw-r--r-- | actions/oauthconnectionssettings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index b1467f0d0..f125f4c63 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -99,7 +99,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $application = $profile->getApplications($offset, $limit); - $cnt == 0; + $cnt = 0; if (!empty($application)) { $al = new ApplicationList($application, $user, $this, true); @@ -112,7 +112,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, $this->page, 'connectionssettings', - array('nickname' => $this->user->nickname)); + array('nickname' => $user->nickname)); } /** |