Peter M. Groen / knowledgetree

Commit 2dfa926176dcdf7e62d90e3f602cc228d06609e2

Authored by Megan Watson
2 parents fff7a9eb fedd209c

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 2 changed files with 12 additions and 0 deletions
setup/wizard/lib/services/unixService.php
  View file @2dfa926
@@ -62,7 +62,13 @@ class unixService extends Service { @@ -62,7 +62,13 @@ class unixService extends Service {
62 function setSystemDirs() { 62 function setSystemDirs() {
63 $conf = $this->util->getDataFromSession('configuration'); 63 $conf = $this->util->getDataFromSession('configuration');
64 $this->outputDir = $conf['paths']['logDirectory']['path'].DS; 64 $this->outputDir = $conf['paths']['logDirectory']['path'].DS;
  65 + if($this->outputDir == '') {
  66 + $this->outputDir = SYS_OUT_DIR;
  67 + }
65 $this->varDir = $conf['paths']['varDirectory']['path'].DS; 68 $this->varDir = $conf['paths']['varDirectory']['path'].DS;
  69 + if($this->varDir == '') {
  70 + $this->varDir = SYS_VAR_DIR;
  71 + }
66 } 72 }
67 73
68 /** 74 /**
setup/wizard/lib/services/windowsService.php
  View file @2dfa926
@@ -73,7 +73,13 @@ class windowsService extends Service { @@ -73,7 +73,13 @@ class windowsService extends Service {
73 function setSystemDirs() { 73 function setSystemDirs() {
74 $conf = $this->util->getDataFromSession('configuration'); 74 $conf = $this->util->getDataFromSession('configuration');
75 $this->outputDir = $conf['paths']['logDirectory']['path'].DS; 75 $this->outputDir = $conf['paths']['logDirectory']['path'].DS;
  76 + if($this->outputDir == '') {
  77 + $this->outputDir = SYS_OUT_DIR;
  78 + }
76 $this->varDir = $conf['paths']['varDirectory']['path'].DS; 79 $this->varDir = $conf['paths']['varDirectory']['path'].DS;
  80 + if($this->varDir == '') {
  81 + $this->varDir = SYS_VAR_DIR;
  82 + }
77 } 83 }
78 84
79 /** 85 /**