diff options
| -rw-r--r-- | classes/User.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/classes/User.php b/classes/User.php index cef4769f3..65e01e799 100644 --- a/classes/User.php +++ b/classes/User.php @@ -150,13 +150,18 @@ class User extends DB_DataObject function noticesWithFriends($offset=0, $limit=20) { $notice = new Notice(); - - $notice->query('SELECT notice.* ' . - 'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' . - 'WHERE subscription.subscriber = ' . $this->id . ' ' . - 'ORDER BY created DESC, notice.id DESC ' . - 'LIMIT ' . $offset . ', ' . $limit); - + + $query='SELECT notice.* ' . + 'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' . + 'WHERE subscription.subscriber = ' . $this->id . ' ' . + 'ORDER BY created DESC, notice.id DESC '; + if(common_config('db','type')=='pgsql') { + $query=$query . 'LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $query=$query . 'LIMIT ' . $offset . ', ' . $limit; + } + $notice->query($query); + return $notice; } |