kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Prefix all global vars

Browse Source
This commit is contained in:
Bernd Bestel
2018-07-24 19:41:35 +02:00
parent 7f8540ff4e
commit bcbdf58376
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/UrlManager.php
View File

@@ -20,7 +20,7 @@ class UrlManager
public function ConstructUrl($relativePath, $isResource = false)
{
if (DISABLE_URL_REWRITING === false || $isResource === true)
if (GROCY_DISABLE_URL_REWRITING === false || $isResource === true)
{
return rtrim($this->BasePath, '/') . $relativePath;
}

8
helpers/extensions.php
View File

@@ -130,17 +130,17 @@ function BoolToString(bool $bool)
function Setting(string $name, $value)
{
if (!defined($name))
if (!defined('GROCY_' . $name))
{
// The content of a $name.txt file in /data/settingoverrides can overwrite the given setting (for embedded mode)
$settingOverrideFile = DATAPATH . '/settingoverrides/' . $name . '.txt';
$settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt';
if (file_exists($settingOverrideFile))
{
define($name, file_get_contents($settingOverrideFile));
define('GROCY_' . $name, file_get_contents($settingOverrideFile));
}
else
{
define($name, $value);
define('GROCY_' . $name, $value);
}
}
}