diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
| commit | 714d920faea302b55857cc3bec4e9e6160ea136a (patch) | |
| tree | cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /actions/oauthconnectionssettings.php | |
| parent | c187bf55974347f7ddb4f28714af57861dce8f08 (diff) | |
| parent | 51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.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)); } /** |