diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-03-03 15:31:44 -0500 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-03-03 15:31:44 -0500 |
| commit | 13713a09bbb2cac0c82c2d6602c8820662740218 (patch) | |
| tree | 07402e6428664dea5b8c0b255e3b50eab0d63d13 /actions | |
| parent | d3c1888256e32495cb0db9065ff7a03e105299a3 (diff) | |
| parent | c7d390e4949b28c28c95375bfe4523de05af7808 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/oauthconnectionssettings.php | 4 | ||||
| -rw-r--r-- | actions/siteadminpanel.php | 4 |
2 files changed, 4 insertions, 4 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)); } /** diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index 8c8f8b374..4b29819b7 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -277,8 +277,8 @@ class SiteAdminPanelForm extends AdminForm $this->unli(); $this->li(); - $this->out->dropdown('language', _('Language'), - get_nice_language_list(), _('Default site language'), + $this->out->dropdown('language', _('Default language'), + get_nice_language_list(), _('Site language when autodetection from browser settings is not available'), false, $this->value('language')); $this->unli(); |