Merge branch 'master' into develop

.github/workflows/docker.yml

@@ -26,9 +26,6 @@ jobs:
           - os: ubuntu-24.04-arm
             platforms: linux/arm64
             required: true
-          - os: ubuntu-24.04-arm
-            platforms: linux/arm/v7
-            required: false
     continue-on-error: ${{ !matrix.required }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -131,4 +128,4 @@ jobs:
             $(printf '${{ env.IMAGE }}@sha256:%s ' *)
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }}

src/api/categories.js

@@ -126,7 +126,7 @@ categoriesAPI.getTopics = async (caller, data) => {
 		throw new Error('[[error:no-privileges]]');
 	}
 
-	const infScrollTopicsPerPage = 20;
+	const infScrollTopicsPerPage = settings.topicsPerPage;
 	const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'recently_replied';
 
 	let start = Math.max(0, parseInt(data.after || 0, 10));