mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix .env migration unescaped $ in passwords (#8688)

Browse Source 
* Fix .env migration unescaped $ in passwords
Better fix for timezone in Laravel

* Simpler change
This commit is contained in:
Tony Murray
2018-05-10 13:20:24 -05:00
committed by GitHub
parent 303336bce4
commit e0f9572582
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LibreNMS/ComposerHelper.php
View File

@@ -136,7 +136,8 @@ class ComposerHelper
if (strpos($content, "$key=") !== false) { if (strpos($content, "$key=") !== false) {
// only replace ones that aren't already set for safety and uncomment // only replace ones that aren't already set for safety and uncomment
$content = preg_replace("/#?$key=\n/", "$key=$value\n", $content); // escape $ in the replacement
$content = preg_replace("/#?$key=\n/", addcslashes("$key=$value\n", '$'), $content);
} else { } else {
$content .= "$key=$value\n"; $content .= "$key=$value\n";
} }

2
config/app.php
View File

@@ -64,7 +64,7 @@ return [
| |
*/ */
'timezone' => null, // set to null to avoid setting timezone 'timezone' => ini_get('date.timezone'), // use existing timezone
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------