tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 00:34:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigDiff: more context, fix diff with empty

Browse Source 
fixes #12262
fixes #12263
This commit is contained in:
Thomas Gelf 2016-08-01 06:49:39 +00:00
parent ce1c6f3099
commit 7655ad451a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Director/ConfigDiff.php
View File

@ -22,10 +22,20 @@ class ConfigDiff
{ {
require_once dirname(__DIR__) . '/vendor/php-diff/lib/Diff.php'; require_once dirname(__DIR__) . '/vendor/php-diff/lib/Diff.php';
$this->a = explode("\n", (string) $a); if (empty($a)) {
$this->b = explode("\n", (string) $b); $this->a = array();
} else {
$this->a = explode("\n", (string) $a);
}
if (empty($b)) {
$this->b = array();
} else {
$this->b = explode("\n", (string) $b);
}
$options = array( $options = array(
'context' => 5,
// 'ignoreWhitespace' => true, // 'ignoreWhitespace' => true,
// 'ignoreCase' => true, // 'ignoreCase' => true,
); );