Fixed pre requisite checker paths (fixes #748)

This commit is contained in:
Bernd Bestel
2020-04-17 19:57:22 +02:00
parent b4a480aa37
commit 356cdf4991
3 changed files with 16 additions and 16 deletions

15
app.php
View File

@@ -8,19 +8,6 @@ use Slim\Factory\AppFactory;
use Grocy\Helpers\UrlManager;
use Grocy\Controllers\LoginController;
// Definitions for embedded mode
if (file_exists(__DIR__ . '/embedded.txt'))
{
define('GROCY_IS_EMBEDDED_INSTALL', true);
define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
define('GROCY_USER_ID', 1);
}
else
{
define('GROCY_IS_EMBEDDED_INSTALL', false);
define('GROCY_DATAPATH', __DIR__ . '/data');
}
// Load composer dependencies
require_once __DIR__ . '/vendor/autoload.php';
@@ -29,7 +16,7 @@ require_once GROCY_DATAPATH . '/config.php';
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
// Definitions for dev/demo/prerelease mode
if (GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease')
if ((GROCY_MODE === 'dev' || GROCY_MODE === 'demo' || GROCY_MODE === 'prerelease') && !defined('GROCY_USER_ID'))
{
define('GROCY_USER_ID', 1);
}