Merge pull request nextcloud#14183 from BrookeDot/patch-2

Remove Nextcloud's Google+ link
tomfun · Feb 14, 2019 · e65f7f0 · e65f7f0
2 parents 6a5b4c8 + 888774a
commit e65f7f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/core/img/googleplus.svg b/core/img/googleplus.svg
diff --git a/settings/templates/settings/personal/development.notice.php b/settings/templates/settings/personal/development.notice.php
@@ -20,54 +20,47 @@
 	<p class="social-button">
 		<?php print_unescaped(str_replace(
 			[
-				'{googleimage}',
 				'{facebookimage}',
 				'{twitterimage}',
 				'{mastodonimage}',
 				'{rssimage}',
 				'{mailimage}',
-				'{googleopen}',
 				'{facebookopen}',
 				'{twitteropen}',
 				'{mastodonopen}',
 				'{rssopen}',
 				'{newsletteropen}',
 				'{linkclose}',
-				'{googletext}',
 				'{facebooktext}',
 				'{twittertext}',
 				'{mastodontext}',
 				'{rsstext}',
 				'{mailtext}',
 			],
 			[
-				image_path('core', 'googleplus.svg'),
 				image_path('core', 'facebook.svg'),
 				image_path('core', 'twitter.svg'),
 				image_path('core', 'mastodon.svg'),
 				image_path('core', 'rss.svg'),
 				image_path('core', 'mail.svg'),
-				'<a target="_blank" rel="noreferrer noopener" href="https://plus.google.com/+Nextcloud">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://twitter.com/nextclouders">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/news/">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
 				'</a>',
-				$l->t('Follow us on Google+'),
 				$l->t('Like our Facebook page'),
 				$l->t('Follow us on Twitter'),
 				$l->t('Follow us on Mastodon'),
 				$l->t('Check out our blog'),
 				$l->t('Subscribe to our newsletter'),
 
 			],
-'{googleopen}<img width="50" src="{googleimage}" title="{googletext}" alt="{googletext}">{linkclose}
-{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
+'{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
 {twitteropen}<img width="50" src="{twitterimage}" title="{twittertext}" alt="{twittertext}">{linkclose}
 {mastodonopen}<img width="50" src="{mastodonimage}" title="{mastodontext}" alt="{mastodontext}">{linkclose}
 {rssopen}<img class="img-circle" width="50" src="{rssimage}" title="{rsstext}" alt="{rsstext}">{linkclose}
 {newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
 		)); ?>
 	</p>
-</div>
+</div>