Merge
This commit is contained in:
commit
1acf0bf3ca
2 changed files with 2 additions and 2 deletions
|
@ -13,7 +13,7 @@ class Sync{
|
||||||
* This is done because the shard could have been offline and we want changes made on the website (which is still online) to eventually hit the shard.
|
* This is done because the shard could have been offline and we want changes made on the website (which is still online) to eventually hit the shard.
|
||||||
* These changes are: createPermissions, createUser, change_pass, change_mail
|
* These changes are: createPermissions, createUser, change_pass, change_mail
|
||||||
*/
|
*/
|
||||||
static public function syncdata ($display = true) {
|
static public function syncdata ($display = false) {
|
||||||
|
|
||||||
if (function_exists('pcntl_fork')) {
|
if (function_exists('pcntl_fork')) {
|
||||||
$pid = pcntl_fork();
|
$pid = pcntl_fork();
|
||||||
|
|
|
@ -37,7 +37,7 @@ if ( isset( $_GET["cron"] ) ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Always try to sync on page load, ie "lazy" cron
|
// Always try to sync on page load, ie "lazy" cron
|
||||||
Sync :: syncdata( true );
|
Sync :: syncdata( false );
|
||||||
|
|
||||||
// Decide what page to load
|
// Decide what page to load
|
||||||
if ( ! isset( $_GET["page"] ) ) {
|
if ( ! isset( $_GET["page"] ) ) {
|
||||||
|
|
Loading…
Reference in a new issue