X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=36a4d5945fcb4cc7b7bb07d8e862324104fa083b;hb=6db3d72ee3710d310e8f745b3dac961afbebe371;hp=f2e016708fef321a74937e3c8c9be93e5ba87401;hpb=9ca789b9529dceedc35f637804179e1034b3f1d9;p=friendica.git

diff --git a/mod/share.php b/mod/share.php
index f2e016708f..36a4d5945f 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,12 +1,12 @@
 <?php
-function share_init(App &$a) {
+function share_init(App $a) {
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 	if((! $post_id) || (! local_user()))
 		killme();
 
-	$r = q("SELECT item.*, contact.network FROM `item` 
-		inner join contact on `item`.`contact-id` = `contact`.`id` 
+	$r = q("SELECT item.*, contact.network FROM `item`
+		inner join contact on `item`.`contact-id` = `contact`.`id`
 		WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
 
 		intval($post_id),
@@ -15,28 +15,18 @@ function share_init(App &$a) {
 	if(! dbm::is_result($r) || ($r[0]['private'] == 1))
 		killme();
 
-	if (!intval(get_config('system','old_share'))) {
-		if (strpos($r[0]['body'], "[/share]") !== false) {
-			$pos = strpos($r[0]['body'], "[share");
-			$o = substr($r[0]['body'], $pos);
-		} else {
-			$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
-
-			if($r[0]['title'])
-				$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
-			$o .= $r[0]['body'];
-			$o.= "[/share]";
-		}
+	if (strpos($r[0]['body'], "[/share]") !== false) {
+		$pos = strpos($r[0]['body'], "[share");
+		$o = substr($r[0]['body'], $pos);
 	} else {
-		$o = '';
+		$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
 
-		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
 		if($r[0]['title'])
-			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
-		$o .= $r[0]['body'] . "\n" ;
-
-		$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+			$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
+		$o .= $r[0]['body'];
+		$o.= "[/share]";
 	}
+
 	echo $o;
 	killme();
 }