From 38bb99f4cb0ac6bbbc2e654076a92bbc920c771e Mon Sep 17 00:00:00 2001
From: ozh <ozh@ozh.org>
Date: Fri, 4 Dec 2015 18:09:04 +0100
Subject: [PATCH] Goodbye FriendFeed !

Fixes #1986
---
 css/share.css               |   1 -
 images/friendfeed.png       | Bin 1406 -> 0 bytes
 includes/functions-html.php |   1 -
 js/share.js                 |   6 ------
 4 files changed, 8 deletions(-)
 delete mode 100644 images/friendfeed.png

diff --git a/css/share.css b/css/share.css
index d162e9f..d41a320 100644
--- a/css/share.css
+++ b/css/share.css
@@ -52,7 +52,6 @@ div.share {
 }
 #share_tw {background:transparent url(../images/twitter.png) left center no-repeat;}
 #share_fb {background:transparent url(../images/facebook.png) left center no-repeat;}
-#share_ff {background:transparent url(../images/friendfeed.png) left center no-repeat;}
 
 #copylink{
 	cursor:pointer;
diff --git a/images/friendfeed.png b/images/friendfeed.png
deleted file mode 100644
index c03f2a740a294c2bd6a8823ee0b43e046bed116e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1406
zcmZQzU<5(|0R}M0U}azs1F|%L7$l?s#Ec9aK$3yMfe}n$5dZ)GXE<Kx%<y9WT!tI-
z3mKlQZ(+F58_w|l%m#+5Qxh4^wD~eT-7$sX&GD5C_m-40Jm1{OaC1&J!^tKOh6@v7
z86K^!XL!A9GQ+Dwix|#z1~FWpk;ZVYC!FC#qdUXJiE$YAjS7s0z-R~zju2qN0Bk}+
zf=m)jf<i)UOk6-&tb8VjJV;tpNQjk<jg3`ENR*AAiAe|<uwnAi)q~9E<>zPO5fb8I
z;shGV2{u544@9vtF$pknfLI*-KnsL~n3$NwnfTe*zzW$w_OUYyfV?2UA_k&>e0Fwj
YE-qmpCCtUe4dw&cFaS}5L{b_H03zr))c^nh

diff --git a/includes/functions-html.php b/includes/functions-html.php
index a3f85eb..5afe463 100644
--- a/includes/functions-html.php
+++ b/includes/functions-html.php
@@ -403,7 +403,6 @@ function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlin
 			<p id="share_links"><?php yourls_e( 'Share with' ); ?> 
 				<a id="share_tw" href="http://twitter.com/home?status=<?php echo $_share; ?>" title="<?php yourls_e( 'Tweet this!' ); ?>" onclick="share('tw');return false">Twitter</a>
 				<a id="share_fb" href="http://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e( 'Share on Facebook' ); ?>" onclick="share('fb');return false;">Facebook</a>
-				<a id="share_ff" href="http://friendfeed.com/share/bookmarklet/frame#title=<?php echo $_share; ?>" title="<?php yourls_e( 'Share on Friendfeed' ); ?>" onclick="share('ff');return false;">FriendFeed</a>
 				<?php
 				yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
 				// Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.
diff --git a/js/share.js b/js/share.js
index bdb59d9..13cc39c 100644
--- a/js/share.js
+++ b/js/share.js
@@ -10,10 +10,8 @@ function update_share() {
 	var text = encodeURIComponent( $('#tweet_body').val() );
 	var url = encodeURIComponent( $('#copylink').val() );
 	var tw = 'http://twitter.com/intent/tweet?status='+text;
-	var ff = 'http://friendfeed.com/share/bookmarklet/frame#title='+text ;
 	var fb = 'http://www.facebook.com/share.php?u='+url ;
 	$('#share_tw').attr('href', tw);
-	$('#share_ff').attr('href', ff);
 	$('#share_fb').attr('href', fb);
 	
 	var charcount = parseInt(140 - $('#tweet_body').val().length);
@@ -25,10 +23,6 @@ function update_share() {
 function share(dest) {
 	var url = $('#share_'+dest).attr('href');
 	switch (dest) {
-	case 'ff':
-		//$('body').append('<script type="text/javascript" src="http://friendfeed.com/share/bookmarklet/javascript"></script>');
-		window.open(url, 'ff','toolbar=no,width=500,height=350');
-		break;
 	case 'fb':
 		//var url = $('#share_fb').attr('href');
 		window.open( url, 'fb','toolbar=no,width=1000,height=550');
-- 
2.45.0