From 7b95ebbb6a7f8be32e0f117acbc938d97a23c412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 11 Jul 2019 09:54:46 -0400 Subject: [PATCH] fix: #7748, if reputation system is disabled, dont check min reputation --- src/controllers/accounts/edit.js | 10 +++++----- src/controllers/accounts/profile.js | 2 +- src/flags.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index 5d600d7e90..c44ee5cce4 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -34,14 +34,14 @@ editController.get = function (req, res, callback) { userData.maximumSignatureLength = meta.config.maximumSignatureLength; userData.maximumAboutMeLength = meta.config.maximumAboutMeLength; userData.maximumProfileImageSize = meta.config.maximumProfileImageSize; - userData.allowProfilePicture = !userData.isSelf || userData.reputation >= meta.config['min:rep:profile-picture']; - userData.allowCoverPicture = !userData.isSelf || userData.reputation >= meta.config['min:rep:cover-picture']; + userData.allowProfilePicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:profile-picture']; + userData.allowCoverPicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:cover-picture']; userData.allowProfileImageUploads = meta.config.allowProfileImageUploads; userData.allowMultipleBadges = meta.config.allowMultipleBadges === 1; userData.allowAccountDelete = meta.config.allowAccountDelete === 1; - userData.allowWebsite = !userData.isSelf || userData.reputation >= meta.config['min:rep:website']; - userData.allowAboutMe = !userData.isSelf || userData.reputation >= meta.config['min:rep:aboutme']; - userData.allowSignature = results.canUseSignature && (!userData.isSelf || userData.reputation >= meta.config['min:rep:signature']); + userData.allowWebsite = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:website']; + userData.allowAboutMe = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:aboutme']; + userData.allowSignature = results.canUseSignature && (!userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:signature']); userData.profileImageDimension = meta.config.profileImageDimension; userData.defaultAvatar = user.getDefaultAvatar(); diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js index 5907a0e115..7d8b65131a 100644 --- a/src/controllers/accounts/profile.js +++ b/src/controllers/accounts/profile.js @@ -82,7 +82,7 @@ profileController.get = function (req, res, callback) { userData.aboutme = translator.escape(results.aboutme); userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username }]); userData.title = userData.username; - userData.allowCoverPicture = !userData.isSelf || userData.reputation >= (meta.config['min:rep:cover-picture'] || 0); + userData.allowCoverPicture = !userData.isSelf || !!meta.config['reputation:disabled'] || userData.reputation >= meta.config['min:rep:cover-picture']; if (!userData.profileviews) { userData.profileviews = 1; diff --git a/src/flags.js b/src/flags.js index 97cd4b09e5..d2603ce3e9 100644 --- a/src/flags.js +++ b/src/flags.js @@ -265,7 +265,7 @@ Flags.validate = function (payload, callback) { } // Check if reporter meets rep threshold (or can edit the target post, in which case threshold does not apply) - if (!editable.flag && data.reporter.reputation < meta.config['min:rep:flag']) { + if (!editable.flag && !meta.config['reputation:disabled'] && data.reporter.reputation < meta.config['min:rep:flag']) { return callback(new Error('[[error:not-enough-reputation-to-flag]]')); } @@ -280,7 +280,7 @@ Flags.validate = function (payload, callback) { } // Check if reporter meets rep threshold (or can edit the target user, in which case threshold does not apply) - if (!editable && data.reporter.reputation < meta.config['min:rep:flag']) { + if (!editable && !meta.config['reputation:disabled'] && data.reporter.reputation < meta.config['min:rep:flag']) { return callback(new Error('[[error:not-enough-reputation-to-flag]]')); }