diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-10 10:48:13 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-10 10:48:13 -0400 |
| commit | a0a6a627e7c8f036588a3e3488fb1c273e3815c4 (patch) | |
| tree | 55f8b7e1bc390eb1b8515701ace3b30938c03df9 /actions | |
| parent | 08c08d02aa48e492eb40ad3790e4fb05c2b86a91 (diff) | |
| parent | 6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/featured.php | 5 | ||||
| -rw-r--r-- | actions/subscriptions.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actions/featured.php b/actions/featured.php index f3bade6a5..86fd3f374 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -107,6 +107,7 @@ class FeaturedAction extends Action $featured_nicks = common_config('nickname', 'featured'); + if (count($featured_nicks) > 0) { $quoted = array(); @@ -118,7 +119,7 @@ class FeaturedAction extends Action $user = new User; $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted))); $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1); - $user->orderBy('user.nickname ASC'); + $user->orderBy(common_database_tablename('user') .'.nickname ASC'); $user->find(); @@ -145,4 +146,4 @@ class FeaturedAction extends Action $this->page, 'featured'); } } -}
\ No newline at end of file +} diff --git a/actions/subscriptions.php b/actions/subscriptions.php index b0c0a9b8d..e6f3c54db 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -139,7 +139,7 @@ class SubscriptionsList extends ProfileList $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, 'method' => 'post', - 'class' => 'form_subcription_edit', + 'class' => 'form_subscription_edit', 'action' => common_local_url('subedit'))); $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $profile->id); |