diff options
| author | Michael <savetheinternet@tinyboard.org> | 2013-06-18 10:46:25 -0700 |
|---|---|---|
| committer | Michael <savetheinternet@tinyboard.org> | 2013-06-18 10:46:25 -0700 |
| commit | 9b0c31daa68c7ab96bc25e09b70ffea77ba23590 (patch) | |
| tree | b76caac312977437540e5e2513409e4046e2ecd9 /inc/functions.php | |
| parent | 0ac9dd5f25ffd9969786567cf7f3081c39f4e0c7 (diff) | |
| parent | 3eda5b054361f7312b40a14728b76841c01628d2 (diff) | |
Merge pull request #116 from Macil/hardlimits
Adds image_hard_limit and reply_hard_limit options
Diffstat (limited to 'inc/functions.php')
| -rw-r--r-- | inc/functions.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/inc/functions.php b/inc/functions.php index 64a3ca88..70848468 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -983,12 +983,8 @@ function index($page, $mod=false) { $replies = array_reverse($posts->fetchAll(PDO::FETCH_ASSOC)); if (count($replies) == ($th['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview'])) { - $count = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri'])); - $count->bindValue(':thread', $th['id'], PDO::PARAM_INT); - $count->execute() or error(db_error($count)); - $count = $count->fetchAll(PDO::FETCH_COLUMN); - - $omitted = array('post_count' => $count[0], 'image_count' => $count[1]); + $count = numPosts($th['id']); + $omitted = array('post_count' => $count['replies'], 'image_count' => $count['images']); } else { $omitted = false; } @@ -1131,14 +1127,19 @@ function checkRobot($body) { return false; } +// Returns an associative array with 'replies' and 'images' keys function numPosts($id) { global $board; - $query = prepare(sprintf("SELECT COUNT(*) as `count` FROM `posts_%s` WHERE `thread` = :thread", $board['uri'])); + $query = prepare(sprintf("SELECT COUNT(*) as `num` FROM `posts_%s` WHERE `thread` = :thread UNION ALL SELECT COUNT(*) FROM `posts_%s` WHERE `file` IS NOT NULL AND `thread` = :thread", $board['uri'], $board['uri'])); $query->bindValue(':thread', $id, PDO::PARAM_INT); $query->execute() or error(db_error($query)); - $result = $query->fetch(); - return $result['count']; + $num_posts = $query->fetch(); + $num_posts = $num_posts['num']; + $num_images = $query->fetch(); + $num_images = $num_images['num']; + + return array('replies' => $num_posts, 'images' => $num_images); } function muteTime() { |