summaryrefslogtreecommitdiff
path: root/actions/featured.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2009-04-10 14:25:25 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2009-04-10 14:25:25 +0200
commit4277a6818c6ac66158dfba3b94bdc1b2eb06b594 (patch)
tree99149b95d0bd0bfaac4b2ad3d646e8cc1da7f51a /actions/featured.php
parentd1bf8b2143f597d9d1b1e7ff472532c596200011 (diff)
parent6cdc2ff444b8c76a3cdc5b8c6e9e7e7539d9b6cc (diff)
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
Diffstat (limited to 'actions/featured.php')
-rw-r--r--actions/featured.php5
1 files changed, 3 insertions, 2 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
+}