Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index e47d7b5b06b71a4bc8a8d353367237b1d30982a0..923795e42625a7502ca735beea632b866689dd03 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -373,7 +373,7 @@ function admin_page_site_post(&$a){
        $singleuser             =       ((x($_POST,'singleuser'))               ? notags(trim($_POST['singleuser']))            : '');
        $proxy_disabled         =       ((x($_POST,'proxy_disabled'))           ? True                                          : False);
        $old_pager              =       ((x($_POST,'old_pager'))                ? True                                          : False);
-       $disable_noscrape = ((x($_POST,'disable_noscrape')) ? true : false);
+
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
                        q("update `contact` set
@@ -502,7 +502,6 @@ function admin_page_site_post(&$a){
        set_config('system','basepath', $basepath);
        set_config('system','proxy_disabled', $proxy_disabled);
        set_config('system','old_pager', $old_pager);
-       set_config('system','disable_noscrape', $disable_noscrape);
 
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
@@ -671,8 +670,6 @@ function admin_page_site(&$a) {
                '$old_pager'            => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
 
                '$relocate_url'     => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
-
-               '$disable_noscrape'=> array('disable_noscrape', t("Disable noscrape"), get_config('system','disable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping. Disabling it will cause higher load on your server and the directory server.")),
        '$form_security_token' => get_form_security_token("admin_site")
 
        ));