From 56bbeb9950102f18d81c7546a36663fd7a6c21a0 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 26 Feb 2014 17:16:55 -0500
Subject: [PATCH] use disableSocialButtons from config

---
 public/templates/category.tpl | 4 ++--
 public/templates/topic.tpl    | 4 ++--
 src/categories.js             | 1 -
 src/routes/api.js             | 1 +
 src/topics.js                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index d536a201cb..25bc8c0a31 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -17,13 +17,13 @@
 	<!-- IF privileges.write -->
 	<button id="new_post" class="btn btn-primary">[[category:new_topic_button]]</button>
 	<!-- ENDIF privileges.write -->
-	<!-- IF !disableSocialButtons -->
+	<!-- IF !config.disableSocialButtons -->
 	<div class="inline-block pull-right">
 		<a href="#" id="facebook-share"><i class="fa fa-facebook-square fa-2x"></i></a>&nbsp;
 		<a href="#" id="twitter-share"><i class="fa fa-twitter-square fa-2x"></i></a>&nbsp;
 		<a href="#" id="google-share"><i class="fa fa-google-plus-square fa-2x"></i></a>&nbsp;
 	</div>
-	<!-- ENDIF !disableSocialButtons -->
+	<!-- ENDIF !config.disableSocialButtons -->
 </div>
 
 <hr/>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 3b6cfa72e8..6b58c9f8a8 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -99,11 +99,11 @@
 								<div class="dropdown share-dropdown">
 									<button title="[[topic:share]]"class="btn btn-sm btn-default share" data-toggle="dropdown" href="#"><i class="fa fa-share-square-o"></i></button>
 									<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel">
-										<!-- IF !disableSocialButtons -->
+										<!-- IF !config.disableSocialButtons -->
 										<li class="btn btn-sm btn-default facebook-share" type="button" title=""><i class="fa fa-facebook fa-fw"></i></li>
 										<li class="btn btn-sm btn-default twitter-share" type="button" title=""><i class="fa fa-twitter fa-fw"></i></li>
 										<li class="btn btn-sm btn-default google-share" type="button" title=""><i class="fa fa-google-plus fa-fw"></i></li>
-										<!-- ENDIF !disableSocialButtons -->
+										<!-- ENDIF !config.disableSocialButtons -->
 										<li>
 											<input type="text" id="post_{posts.pid}_link" value="" class="form-control pull-right post-link" style=""></input>
 										<li>
diff --git a/src/categories.js b/src/categories.js
index 248fb4417f..2433953e35 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -78,7 +78,6 @@ var db = require('./database'),
 			category.topics = results.topics.topics;
 			category.nextStart = results.topics.nextStart;
 			category.pageCount = results.pageCount;
-			category.disableSocialButtons = meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false;
 			category.topic_row_size = 'col-md-9';
 
 			callback(null, category);
diff --git a/src/routes/api.js b/src/routes/api.js
index 9c1f745ab6..4e2f601c8f 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -60,6 +60,7 @@ var path = require('path'),
 				config.allowFileUploads = parseInt(meta.config.allowFileUploads, 10) === 1;
 				config.allowTopicsThumbnail = parseInt(meta.config.allowTopicsThumbnail, 10) === 1;
 				config.usePagination = parseInt(meta.config.usePagination, 10) === 1;
+				config.disableSocialButtons = parseInt(meta.config.disableSocialButtons, 10) === 1;
 				config.topicsPerPage = meta.config.topicsPerPage || 20;
 				config.postsPerPage = meta.config.postsPerPage || 20;
 				config.maximumFileSize = meta.config.maximumFileSize;
diff --git a/src/topics.js b/src/topics.js
index 328f50ae9f..2fdb2f151a 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -395,6 +395,7 @@ var async = require('async'),
 					postData[i].votes = postData[i].votes || 0;
 					postData[i].display_moderator_tools = (uid != 0) && results.privileges[i].editable;
 					postData[i].display_move_tools = results.privileges[i].move;
+
 					if(parseInt(postData[i].deleted, 10) === 1 && !results.privileges[i].view_deleted) {
 						postData[i].content = 'This post is deleted!';
 					}
@@ -748,7 +749,6 @@ var async = require('async'),
 				topicData.pageCount = results.pageCount;
 				topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
 				topicData.expose_tools = results.privileges.editable ? 1 : 0;
-				topicData.disableSocialButtons = meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false;
 
 				callback(null, topicData);
 			});