diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
| commit | d1cae2da2abc3a602f682114bc02cce08a7e7578 (patch) | |
| tree | ef3147f9db85bdde8e26303971a40d86e10bb508 /include/directory.php | |
| parent | 33696cc8392daeb08d011aa3b1209f3b121898ea (diff) | |
| parent | b86253c655f974920c4d3de0915611a7e66c7336 (diff) | |
| download | volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2 volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/directory.php')
| -rw-r--r-- | include/directory.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/directory.php b/include/directory.php index 5f3696a58..c286f5683 100644 --- a/include/directory.php +++ b/include/directory.php @@ -19,11 +19,6 @@ function directory_run($argv, $argc){ if($dirmode === false) $dirmode = DIRECTORY_MODE_NORMAL; - if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) { - syncdirs($argv[1]); - return; - } - $x = q("select * from channel where channel_id = %d limit 1", intval($argv[1]) ); @@ -32,6 +27,15 @@ function directory_run($argv, $argc){ $channel = $x[0]; + + if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) { + syncdirs($argv[1]); + + // Now update all the connections + proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); + return; + } + $directory = find_upstream_directory($dirmode); if($directory) { @@ -49,7 +53,7 @@ function directory_run($argv, $argc){ // Now update all the connections - proc_run('php','notifier','refresh_all',$channel['channel_id']); + proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); } |