Merge pull request #3343 from annando/1704-mastodon

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index f3a221eb8ef4c985f9b8ad9e86a523efb8a4fa61..36a4d5945fcb4cc7b7bb07d8e862324104fa083b 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,7 +1,5 @@
 <?php
-
-if(! function_exists('share_init')) {
-function share_init(&$a) {
+function share_init(App $a) {
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
        if((! $post_id) || (! local_user()))
@@ -14,37 +12,25 @@ function share_init(&$a) {
                intval($post_id),
                intval(local_user())
        );
-       if(! count($r) || ($r[0]['private'] == 1))
+       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();
 }
-}
 
-if(! function_exists('share_header')) {
 function share_header($author, $profile, $avatar, $guid, $posted, $link) {
        $header = "[share author='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$author).
                "' profile='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$profile).
@@ -60,4 +46,3 @@ function share_header($author, $profile, $avatar, $guid, $posted, $link) {
 
        return $header;
 }
-}