Merge branch 'master' into develop

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 5168589f7974a758e27d8b730e1f43594900ad83..e2d3f4d367bf94ebdea47c62c85d3df3fb5d8f22 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -352,7 +352,7 @@ function settings_post(&$a) {
        check_form_security_token_redirectOnErr('/settings', 'settings');
 
        if (x($_POST,'resend_relocate')) {
-               proc_run('php', 'include/notifier.php', 'relocate', local_user());
+               proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user());
                info(t("Relocate message has been send to your contacts"));
                goaway('settings');
        }
@@ -614,7 +614,7 @@ function settings_post(&$a) {
                // Update global directory in background
                $url = $_SESSION['my_url'];
                if($url && strlen(get_config('system','directory')))
-                       proc_run('php',"include/directory.php","$url");
+                       proc_run(PRIORITY_LOW, "include/directory.php", $url);
        }
 
        require_once('include/profile_update.php');
@@ -989,6 +989,9 @@ function settings_content(&$a) {
                        '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
                        '$no_auto_update'       => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
 
+                       '$d_tset' => t('General Theme Settings'),
+                       '$d_ctset' => t('Custom Theme Settings'),
+                       '$d_cset' => t('Content Settings'),
                        'stitle' => t('Theme settings'),
                        '$theme_config' => $theme_config,
                ));