From ea4bf270bca74c7279d86d324d0061a93c80cd28 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Fri, 5 Sep 2014 11:22:47 +0200
Subject: [PATCH] Merge

---
 code/web/private_php/ams/autoload/sync.php | 2 +-
 code/web/public_php/ams/index.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/web/private_php/ams/autoload/sync.php b/code/web/private_php/ams/autoload/sync.php
index fe05e628e..47d6cb61b 100644
--- a/code/web/private_php/ams/autoload/sync.php
+++ b/code/web/private_php/ams/autoload/sync.php
@@ -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.
      * 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')) {
         $pid = pcntl_fork();
diff --git a/code/web/public_php/ams/index.php b/code/web/public_php/ams/index.php
index 13fedc2cc..de2e93235 100644
--- a/code/web/public_php/ams/index.php
+++ b/code/web/public_php/ams/index.php
@@ -37,7 +37,7 @@ if ( isset( $_GET["cron"] ) ) {
     }
 
 // Always try to sync on page load, ie "lazy" cron
-Sync :: syncdata( true );
+Sync :: syncdata( false );
 
 // Decide what page to load
 if ( ! isset( $_GET["page"] ) ) {