From: Michael <heluecht@pirati.ca>
Date: Sun, 5 Nov 2017 17:23:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into worker-class
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=930309d2ecb8ed48f55408c9dddf9a3ec62731ab;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into worker-class
---

930309d2ecb8ed48f55408c9dddf9a3ec62731ab
diff --cc mod/settings.php
index b4d8d338f9,d128ad5a75..6c160a21f0
--- a/mod/settings.php
+++ b/mod/settings.php
@@@ -2,7 -2,8 +2,9 @@@
  
  use Friendica\App;
  use Friendica\Core\System;
 +use Friendica\Core\Worker;
+ use Friendica\Core\Config;
+ use Friendica\Core\PConfig;
  
  require_once('include/group.php');
  require_once('include/socgraph.php');
@@@ -629,8 -640,8 +641,8 @@@ function settings_post(App $a) 
  	if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
  		// Update global directory in background
  		$url = $_SESSION['my_url'];
- 		if ($url && strlen(get_config('system','directory'))) {
+ 		if ($url && strlen(Config::get('system', 'directory'))) {
 -			proc_run(PRIORITY_LOW, "include/directory.php", $url);
 +			Worker::add(PRIORITY_LOW, "directory", $url);
  		}
  	}