Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / actions / featured.php

diff --git a/actions/featured.php b/actions/featured.php
index d1ac6e054e9af3ed47e6a19cfa45716f179e645a..79eba2aa67b9985372a2e23a1e977306a62439ca 100644 (file)
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -50,6 +50,11 @@ class FeaturedAction extends Action
 {
     var $page = null;
 
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
     function prepare($args)
     {
         parent::prepare($args);
@@ -102,6 +107,7 @@ class FeaturedAction extends Action
 
         $featured_nicks = common_config('nickname', 'featured');
 
+
         if (count($featured_nicks) > 0) {
 
             $quoted = array();
@@ -113,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();
 
@@ -140,4 +146,4 @@ class FeaturedAction extends Action
                               $this->page, 'featured');
         }
     }
-}
\ No newline at end of file
+}