Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#711 remove Google+ #16099

Merged
merged 1 commit into from
Jan 2, 2020
Merged

dev/core#711 remove Google+ #16099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Dedupe/Merger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {

Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Friend/Form/Friend.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout">
Expand Down
4 changes: 0 additions & 4 deletions templates/CRM/common/SocialNetwork.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@
<img title="Facebook Like Button" src="{$config->userFrameworkResourceURL|replace:'https://':'http://'}/i/fblike.png" alt="Facebook Button" />
</a>
{else}
<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
{*use advanced buttons for pages*}
<div class="label">
<iframe allowtransparency="true" frameborder="0" scrolling="no"
src="https://platform.twitter.com/widgets/tweet_button.html?text={$title}&amp;url={$url|escape:'url'}"
style="width:100px; height:20px;">
</iframe>
</div>
<div class="label">
<g:plusone href={$url}></g:plusone>
</div>
<div class="label" style="width:300px;">
<iframe src="https://www.facebook.com/plugins/like.php?app_id=240719639306341&amp;href={$url|escape:'url'}&amp;send=false&amp;layout=standard&amp;show_faces=false&amp;action=like&amp;colorscheme=light" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:300px; height:30px;" allowTransparency="true">
</iframe>
Expand Down
1 change: 0 additions & 1 deletion xml/templates/civicrm_data.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrade SQL needed to remove this.

(@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),
Expand Down