From ebf820d571fb4ef3c087b792d383455520ce2109 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 10 Feb 2016 11:33:41 +0200
Subject: [PATCH] remove from global config

---
 public/src/client/account/edit.js | 8 ++++----
 src/controllers/accounts/edit.js  | 4 ++++
 src/controllers/api.js            | 2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index 128ec3668e..1dd5795f4a 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -274,19 +274,19 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'],
 
 	function updateSignature() {
 		var el = $('#inputSignature');
-		$('#signatureCharCountLeft').html(getCharsLeft(el, config.maximumSignatureLength));
+		$('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength));
 
 		el.on('keyup change', function() {
-			$('#signatureCharCountLeft').html(getCharsLeft(el, config.maximumSignatureLength));
+			$('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength));
 		});
 	}
 
 	function updateAboutMe() {
 		var el = $('#inputAboutMe');
-		$('#aboutMeCharCountLeft').html(getCharsLeft(el, config.maximumAboutMeLength));
+		$('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));
 
 		el.on('keyup change', function() {
-			$('#aboutMeCharCountLeft').html(getCharsLeft(el, config.maximumAboutMeLength));
+			$('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength));
 		});
 	}
 
diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index 26802a5cdd..44f4f0f426 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -7,6 +7,7 @@ var winston = require('winston');
 
 var db = require('../../database');
 var user = require('../../user');
+var meta = require('../../meta');
 var helpers = require('../helpers');
 var accountHelpers = require('./helpers');
 
@@ -18,6 +19,9 @@ editController.get = function(req, res, callback) {
 			return callback(err);
 		}
 
+		userData.maximumSignatureLength = parseInt(meta.config.maximumSignatureLength, 10) || 255;
+		userData.maximumAboutMeLength = parseInt(meta.config.maximumAboutMeLength, 10) || 1000;
+
 		userData.title = '[[pages:account/edit, ' + userData.username + ']]';
 		userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:edit]]'}]);
 
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 79cf9dd6d4..75fee72ebe 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -47,8 +47,6 @@ apiController.getConfig = function(req, res, next) {
 	config.minimumUsernameLength = meta.config.minimumUsernameLength;
 	config.maximumUsernameLength = meta.config.maximumUsernameLength;
 	config.minimumPasswordLength = meta.config.minimumPasswordLength;
-	config.maximumSignatureLength = meta.config.maximumSignatureLength;
-	config.maximumAboutMeLength = meta.config.maximumAboutMeLength || 1000;
 	config.useOutgoingLinksPage = parseInt(meta.config.useOutgoingLinksPage, 10) === 1;
 	config.allowGuestSearching = parseInt(meta.config.allowGuestSearching, 10) === 1;
 	config.allowGuestUserSearching = parseInt(meta.config.allowGuestUserSearching, 10) === 1;