fix #167

PHPfox-Official · Jul 25, 2015 · f04c321 · f04c321
1 parent 81781dc
commit f04c321
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/PF.Base/include/library/phpfox/setting/setting.class.php b/PF.Base/include/library/phpfox/setting/setting.class.php
@@ -115,7 +115,8 @@ class Phpfox_Setting
 		'user.no_show_activity_points' => true,
 		'user.split_full_name' => false,
 		'user.cache_featured_users' => false,
-		'user.cache_user_inner_joins' => false
+		'user.cache_user_inner_joins' => false,
+		'feed.enable_check_in' => false
 	];
 
 	public $hide = [

diff --git a/PF.Base/module/feed/template/default/block/form.html.php b/PF.Base/module/feed/template/default/block/form.html.php
@@ -90,12 +90,6 @@
 			<div class="global_attachment_holder_section" id="global_attachment_status" style="display:block;">
 				<div id="global_attachment_status_value" style="display:none;">{if isset($aFeedCallback.module) || defined('PHPFOX_IS_USER_PROFILE')}{phrase var='feed.write_something'}{else}{phrase var='feed.what_s_on_your_mind'}{/if}</div>
 				<textarea {if isset($aPage)} id="pageFeedTextarea" {else} {if isset($aEvent)} id="eventFeedTextarea" {else} {if isset($bOwnProfile) && $bOwnProfile == false}id="profileFeedTextarea" {/if}{/if}{/if} cols="60" rows="8" name="val[user_status]" placeholder="{if isset($aFeedCallback.module) || defined('PHPFOX_IS_USER_PROFILE')}{phrase var='feed.write_something'}{else}{phrase var='feed.what_s_on_your_mind'}{/if}"></textarea>
-                {if isset($bLoadCheckIn) && $bLoadCheckIn == true}
-                    <script type="text/javascript">
-                        oTranslations['feed.at_location'] = "{phrase var='feed.at_location'}";
-                    </script>
-                    <div id="js_location_feedback"></div>
-                {/if}
 			</div>
 
 			{foreach from=$aFeedStatusLinks item=aFeedStatusLink}