"old_share" is removed

diff --git a/include/api.php b/include/api.php
index d7fa1d587547f399da085f5861a1f6942d12454e..701e527cc8236ad86b43aaf04b0d38f500f7f5b4 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1686,20 +1686,16 @@ use \Friendica\Core\Config;
                );
 
                if ($r[0]['body'] != "") {
-                       if (!intval(get_config('system','old_share'))) {
-                               if (strpos($r[0]['body'], "[/share]") !== false) {
-                                       $pos = strpos($r[0]['body'], "[share");
-                                       $post = substr($r[0]['body'], $pos);
-                               } else {
-                                       $post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
-
-                                       $post .= $r[0]['body'];
-                                       $post .= "[/share]";
-                               }
-                               $_REQUEST['body'] = $post;
-                       } else
-                               $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
+                       if (strpos($r[0]['body'], "[/share]") !== false) {
+                               $pos = strpos($r[0]['body'], "[share");
+                               $post = substr($r[0]['body'], $pos);
+                       } else {
+                               $post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
 
+                               $post .= $r[0]['body'];
+                               $post .= "[/share]";
+                       }
+                       $_REQUEST['body'] = $post;
                        $_REQUEST['profile_uid'] = api_user();
                        $_REQUEST['type'] = 'wall';
                        $_REQUEST['api_source'] = true;

diff --git a/mod/admin.php b/mod/admin.php
index 14751308344f39fc233566aaffa717ea6f871c41..5cfeeb376f7e2b6f27c1cbbd474e11d97909d0f5 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -649,7 +649,6 @@ function admin_page_site_post(App $a) {
        $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
        $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
        $force_ssl              =       ((x($_POST,'force_ssl'))                ? True                                          : False);
-       $old_share              =       ((x($_POST,'old_share'))                ? True                                          : False);
        $hide_help              =       ((x($_POST,'hide_help'))                ? True                                          : False);
        $suppress_language      =       ((x($_POST,'suppress_language'))        ? True                                          : False);
        $suppress_tags          =       ((x($_POST,'suppress_tags'))            ? True                                          : False);
@@ -805,7 +804,6 @@ function admin_page_site_post(App $a) {
        set_config('config','private_addons', $private_addons);
 
        set_config('system','force_ssl', $force_ssl);
-       set_config('system','old_share', $old_share);
        set_config('system','hide_help', $hide_help);
        set_config('system','use_fulltext_engine', $use_fulltext_engine);
        set_config('system','itemcache', $itemcache);
@@ -996,7 +994,6 @@ function admin_page_site(App $a) {
                '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
                '$ssl_policy'           => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
                '$force_ssl'            => array('force_ssl', t("Force SSL"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
-               '$old_share'            => array('old_share', t("Old style 'Share'"), get_config('system','old_share'), t("Deactivates the bbcode element 'share' for repeating items.")),
                '$hide_help'            => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
                '$singleuser'           => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
                '$maximagesize'         => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),

diff --git a/mod/share.php b/mod/share.php
index 928ccdef263efc45b7f24f66c6c8c123f945888a..36a4d5945fcb4cc7b7bb07d8e862324104fa083b 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -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();
 }

diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
index 2edfddb885f277bbae863ea9cf1b0b2ea04c494f..e778b7ad490870d7b71a7401eb5cec6cdca14e03 100644 (file)
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@ -56,7 +56,6 @@
        {{include file="field_select.tpl" field=$theme_mobile}}
        {{include file="field_select.tpl" field=$ssl_policy}}
        {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
-       {{include file="field_checkbox.tpl" field=$old_share}}
        {{include file="field_checkbox.tpl" field=$hide_help}}
        {{include file="field_select.tpl" field=$singleuser}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>