From d4eb4fe6805082f56adb97ff72808c3b3e6e4d26 Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Sat, 13 Apr 2024 15:14:15 +0700
Subject: [PATCH] Minor improvements (#1450)

* Minor improvements

* Update CHANGELOG.md

* Update memberlist.php
---
 CHANGELOG.md                           | 2 +-
 memberlist.php                         | 4 ++--
 styles/templates/default/viewtopic.tpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 991b2d77e..0b460c2fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 - Improved app debug [\#1438](https://github.com/torrentpier/torrentpier/pull/1438) ([belomaxorka](https://github.com/belomaxorka))
 - Demo mode: Allow registering torrents by default [\#1440](https://github.com/torrentpier/torrentpier/pull/1440) ([belomaxorka](https://github.com/belomaxorka))
 - Code refactoring [\#1441](https://github.com/torrentpier/torrentpier/pull/1441) ([belomaxorka](https://github.com/belomaxorka))
-- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#1435](https://github.com/torrentpier/torrentpier/pull/1435), [\#1443](https://github.com/torrentpier/torrentpier/pull/1443), [\#1446](https://github.com/torrentpier/torrentpier/pull/1446), [\#1450](https://github.com/torrentpier/torrentpier/pull/1450) ([belomaxorka](https://github.com/belomaxorka))
 - New Crowdin updates [\#1444](https://github.com/torrentpier/torrentpier/pull/1444), [\#1447](https://github.com/torrentpier/torrentpier/pull/1447) ([Exileum](https://github.com/Exileum))
 
 ## [v2.4.2](https://github.com/torrentpier/torrentpier/tree/v2.4.2) (2024-03-30)
diff --git a/memberlist.php b/memberlist.php
index a81ae189f..7007e0b04 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -120,8 +120,8 @@ if ($result = DB()->fetch_rowset($sql)) {
 $paginationurl = "memberlist.php?mode=$mode&amp;order=$sort_order&amp;role=$role";
 $paginationurl .= $username ? "&amp;username=$username" : '';
 
-if ($mode != 'topten' || $bb_cfg['topics_per_page'] < 10) {
-    $sql = "SELECT COUNT(*) AS total FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")";
+if ($mode != 'topten') {
+    $sql = "SELECT COUNT(*) AS total FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ") $where_sql";
     if (!$result = DB()->sql_query($sql)) {
         bb_die('Error getting total users');
     }
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 045acf3f8..92f89bcb7 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -31,7 +31,7 @@
     ajax.callback.view_post = function (data) {
         loadedText[data.post_id] = true;
         $('#post_' + data.post_id + ' div.post_body').prepend(
-            '<div class="tCenter" id="ptx-' + data.post_id + '"><textarea style="width: 99%; height: 200px; line-height: 1.2;">' + data['post_text'] + '</textarea><hr></div>'
+            '<div class="tCenter" id="ptx-' + data.post_id + '"><textarea style="width: 99%; height: 200px; line-height: 1.2;" readonly>' + data['post_text'] + '</textarea><hr></div>'
         );
     };
 </script>