diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-09-08 15:37:47 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-09-08 15:37:47 -0400 |
| commit | dc259bea9af388a9ddc2727446590cd4c6cc5fe2 (patch) | |
| tree | 7d5ec7eae3cb1b548cec750151783484ed800cf4 /src | |
| parent | 0e458e1046edb34a5c73b98974a2b723cebdbd25 (diff) | |
| parent | 7c6d51a0bb5197edbe2cafa82a5a55359dbd80ee (diff) | |
Merge branch 'master' of /pichat/repo
Diffstat (limited to 'src')
| -rw-r--r-- | src/rooms.clj | 1 | ||||
| -rw-r--r-- | src/site.clj | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rooms.clj b/src/rooms.clj index d276944..4f7d6c4 100644 --- a/src/rooms.clj +++ b/src/rooms.clj @@ -73,6 +73,7 @@ :key (room-db :key) :name (room-db :name) :description (room-db :description) + :history_size (room-db :history_size) :users (ref {}) :messages (ref (fetch-messages-by-room (room-db :room_id) false)) :topic (ref nil) diff --git a/src/site.clj b/src/site.clj index 23e2d8d..30aa90e 100644 --- a/src/site.clj +++ b/src/site.clj @@ -704,12 +704,11 @@ WHERE u.user_id = ANY(?)" (if-let [st (lookup-room-template session (:key room) template)]
(let [now (System/currentTimeMillis)
nick (session :nick)
- limit (if (:admin_only room) *vip-dumps-per-page* *dumps-per-page*)
raw-msgs (reverse (tags/fetch-image-dumps :room (:key room)
:image-only false
:user-tag-id (:user_id session)
:hide-vip false
- :limit limit))
+ :limit (:history_size room)))
message-list (to-array (map process-message-for-output raw-msgs))]
(if nick
(dosync
|