diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 57e6156155a8..328fbcd29479 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1231,7 +1231,7 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio } // Provide a select drop-down for the location's type/provider - // eg websites: Google+, Facebook... + // eg websites: Facebook... if ($blockInfo['hasType']) { diff --git a/templates/CRM/Friend/Form/Friend.tpl b/templates/CRM/Friend/Form/Friend.tpl index 549f2537dbae..8d79bb433b3d 100644 --- a/templates/CRM/Friend/Form/Friend.tpl +++ b/templates/CRM/Friend/Form/Friend.tpl @@ -22,7 +22,7 @@ {assign var=pageType value="Pledge Information page"} {ts}Tell a Friend gives registering pledge signers an easy way to spread the word about this pledge. The registration thank-you page will include a link to a form where they can enter their friends' email addresses, along with a personalized message. CiviCRM will record these solicitation activities, and will add the friends to your database.{/ts} {/if} - {ts}If sharing through social media is enabled, links allowing people to share with their social network will also be included on the Tell a Friend form (e.g. Facebook "Like", Google+, and Twitter). You can turn social media sharing on and off from the Settings tab.{/ts} + {ts}If sharing through social media is enabled, links allowing people to share with their social network will also be included on the Tell a Friend form (e.g. Facebook "Like" and Twitter). You can turn social media sharing on and off from the Settings tab.{/ts}
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/common/SocialNetwork.tpl b/templates/CRM/common/SocialNetwork.tpl index fb2b2d3c21fc..a5b786b173f1 100644 --- a/templates/CRM/common/SocialNetwork.tpl +++ b/templates/CRM/common/SocialNetwork.tpl @@ -26,7 +26,6 @@ Facebook Button {else} - {*use advanced buttons for pages*}
-
- -
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index d85d0d77863e..f4ced5bf8217 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -740,7 +740,6 @@ VALUES (@option_group_id_website, 'Work', 1, 'Work', NULL, 0, 1, 1, NULL, 0, 0, 1, NULL, NULL, NULL), (@option_group_id_website, 'Main', 2, 'Main', NULL, 0, NULL, 2, NULL, 0, 0, 1, NULL, NULL, NULL), (@option_group_id_website, 'Facebook', 3, 'Facebook', NULL, 0, NULL, 3, NULL, 0, 0, 1, NULL, NULL, NULL), - (@option_group_id_website, 'Google+', 4, 'Google_', NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL, NULL), (@option_group_id_website, 'Instagram', 5, 'Instagram', NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL, NULL), (@option_group_id_website, 'LinkedIn', 6, 'LinkedIn', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL, NULL), (@option_group_id_website, 'MySpace', 7, 'MySpace', NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL, NULL),