Commit 9d2d0130 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4710 (Disable default Google+ field and share option)

parent 7f5d1629

sources/cns_install.php

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ function install_cns($upgrade_from = null) 
        //cns_make_boiler_custom_field('im_jabber'); Old-school, although XMPP is still popular for some, so we won't remove entirely

        cns_make_boiler_custom_field('im_skype');

        cns_make_boiler_custom_field('sn_facebook');

        cns_make_boiler_custom_field('sn_google');

        //cns_make_boiler_custom_field('sn_google');

        cns_make_boiler_custom_field('sn_twitter');



        $GLOBALS['FORUM_DB']->create_table('f_invites', array(

sources/hooks/modules/admin_setupwizard/core_cns.php

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class Hook_sw_core_cns 
            $settings['have_default_full_emoticon_set'] = (count($test) != 0) ? '1' : '0';



            $have_default_cpf_set = false;

            $fields_l = array('im_jabber', 'im_skype', 'interests', 'location', 'occupation', 'sn_google', 'sn_facebook', 'sn_twitter');

            $fields_l = array('im_jabber', 'im_skype', 'interests', 'location', 'occupation'/*, 'sn_google'*/, 'sn_facebook', 'sn_twitter');

            foreach ($fields_l as $field) {

                $test = $GLOBALS['FORUM_DB']->query_select_value_if_there('f_custom_fields', 'id', array($GLOBALS['FORUM_DB']->translate_field_ref('cf_name') => do_lang('DEFAULT_CPF_' . $field . '_NAME')));

                if (!is_null($test)) {

themes/default/templates_custom/BLOCK_MAIN_SCREEN_ACTIONS.tpl

+0 −5
Original line number Diff line number Diff line
@@ -15,9 +15,4 @@ 
	{+START,IF,{$ADDON_INSTALLED,bookmarks}}

		{$,<div class="favorites"><a class="link_exempt" href="{$FIND_SCRIPT*,bookmarks}?no_redirect=1&amp;type=ad&amp;url={$SELF_URL&*}&amp;title={TITLE&*}" onclick="window.faux_open(maintain_theme_in_link(this.getAttribute('href')),'','width=600,height=500,status=yes,resizable=yes,scrollbars=yes'); return false;"><span>{!BOOKMARK_THIS}</span></a></div>}

	{+END}



	<div class="google_plusone">

		<div class="g-plusone" data-size="medium" data-count="true" data-href="{EASY_SELF_URL*}"></div>

		{$EXTRA_FOOT,<script src="https://apis.google.com/js/plusone.js"></script>}

	</div>

</nav></aside>