From: rabuzarus <rabuzarus@t-online.de>
Date: Fri, 17 Mar 2017 12:22:23 +0000 (+0100)
Subject: Merge pull request #3226 from annando/1702-only-worker
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3cef98caf68d9fa28ba1beacedeaa77917987772;p=friendica.git

Merge pull request #3226 from annando/1702-only-worker

The worker is now the only background processing system
---

3cef98caf68d9fa28ba1beacedeaa77917987772
diff --cc mod/admin.php
index e8c071113d,d599220d65..b863eb909c
--- a/mod/admin.php
+++ b/mod/admin.php
@@@ -809,9 -803,8 +798,7 @@@ function admin_page_site_post(App $a) 
  	set_config('system','temppath', $temppath);
  	set_config('system','basepath', $basepath);
  	set_config('system','proxy_disabled', $proxy_disabled);
 -	set_config('system','old_pager', $old_pager);
  	set_config('system','only_tag_search', $only_tag_search);
- 	set_config('system','worker', $worker);
  	set_config('system','worker_queues', $worker_queues);
  	set_config('system','worker_dont_fork', $worker_dont_fork);
  	set_config('system','worker_fastlane', $worker_fastlane);
diff --cc view/templates/admin_site.tpl
index e670222d4d,2faf64e268..fdba195f17
--- a/view/templates/admin_site.tpl
+++ b/view/templates/admin_site.tpl
@@@ -128,9 -125,9 +124,8 @@@
  	{{include file="field_input.tpl" field=$optimize_max_tablesize}}
  	{{include file="field_input.tpl" field=$optimize_fragmentation}}
  	{{include file="field_input.tpl" field=$abandon_days}}
- 	{{include file="field_input.tpl" field=$lockpath}}
  	{{include file="field_input.tpl" field=$temppath}}
  	{{include file="field_input.tpl" field=$basepath}}
 -	{{include file="field_checkbox.tpl" field=$suppress_language}}
  	{{include file="field_checkbox.tpl" field=$suppress_tags}}
  	{{include file="field_checkbox.tpl" field=$nodeinfo}}
  	{{include file="field_input.tpl" field=$embedly}}