diff --git a/public/templates/account.tpl b/public/templates/account.tpl index 571bb2ddd2..f54b52cb95 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -91,12 +91,14 @@

+ [[user:signature]]
{signature}
+ diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index 9dd8d97ef4..0c4f8ca196 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -83,12 +83,14 @@ +
+
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl index 66343f3acb..2fe46bbdc0 100644 --- a/public/templates/admin/settings.tpl +++ b/public/templates/admin/settings.tpl @@ -82,6 +82,11 @@ Allow registration +
+ +
Minimum Username Length

Maximum Username Length
diff --git a/src/posts.js b/src/posts.js index 29879cd5c2..56ce12453b 100644 --- a/src/posts.js +++ b/src/posts.js @@ -213,7 +213,10 @@ var db = require('./database'), post.user_postcount = userData.postcount || 0; post.user_banned = parseInt(userData.banned, 10) === 1; post.picture = userData.picture || gravatar.url('', {}, https = nconf.get('https')); - post.signature = signature; + + if(meta.config.disableSignatures === undefined || parseInt(meta.config.disableSignatures, 10) === 0) { + post.signature = signature; + } for (var info in customUserInfo) { if (customUserInfo.hasOwnProperty(info)) { diff --git a/src/routes/user.js b/src/routes/user.js index d7b88ff03e..c97bcf6126 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -548,6 +548,8 @@ var fs = require('fs'), data.yourid = callerUID; data.theirid = uid; + data.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; + user.getFollowingCount(uid, function (followingCount) { user.getFollowerCount(uid, function (followerCount) { data.followingCount = followingCount;