]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into worker-class
authorMichael <heluecht@pirati.ca>
Sun, 5 Nov 2017 17:23:53 +0000 (17:23 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 5 Nov 2017 17:23:53 +0000 (17:23 +0000)
1  2 
include/items.php
mod/settings.php

Simple merge
index b4d8d338f9af0bb8202c49b93ac2e5dc052bbcd0,d128ad5a757ace343954b307dba2db9a035983e0..6c160a21f08fd3656dbd5c9c7f09772795519bb9
@@@ -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);
                }
        }