Merge pull request #56 in ZP/z-push from...

Merge pull request #56 in ZP/z-push from bugfix/ZP-703-z-push-top-and-admin-does-NOT-honor-new-ZPUSH_CONFIG-define to develop

* commit 'df0558e3':
  ZP-703 z-push-top and -admin does NOT honor new ZPUSH_CONFIG define. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 2949dd5d)

src/z-push-admin.php

@@ -92,7 +92,8 @@ include('lib/syncobjects/syncuserinformation.php');
 include('lib/syncobjects/syncdeviceinformation.php');
 include('lib/syncobjects/syncdevicepassword.php');
 include('lib/syncobjects/syncitemoperationsattachment.php');
-include('config.php');
+if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+include_once(ZPUSH_CONFIG);
 include('version.php');
 
 /**
@@ -871,4 +872,4 @@ class ZPushAdminCLI {
 }
 
 
-?>
+?>
\ No newline at end of file

src/z-push-top.php

@@ -53,7 +53,8 @@ include('lib/core/topcollector.php');
 include('lib/utils/utils.php');
 include('lib/request/request.php');
 include('lib/request/requestprocessor.php');
-include('config.php');
+if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+include_once(ZPUSH_CONFIG);
 include('version.php');
 
 /************************************************