Merges changes from Torsten

Nils Langner · Nils Langner · commit 1ed90d4f66ec · 2014-03-24T14:18:22.000+01:00
diff --git a/module/VisualCeption.php b/module/VisualCeption.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 
 namespace Codeception\Module;
@@ -34,7 +35,7 @@ private function init ()
         }
 
         if (! is_dir($this->referenceImageDir)) {
-            mkdir($this->referenceImageDir, 0777);
+            mkdir($this->referenceImageDir, 0666);
         }
     }
 
@@ -68,7 +69,7 @@ private function getScreenshotPath ($identifier)
     {
         $debugDir = \Codeception\Configuration::logDir() . 'debug/tmp/';
         if (! is_dir($debugDir)) {
-            mkdir($debugDir, 0777);
+            mkdir($debugDir, 0666);
         }
         return $debugDir . $this->getScreenshotName($identifier);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<<<<<<< HEAD`
`1`	`2`	`<?php`
`2`	`3`
`3`	`4`	`namespace Codeception\Module;`
`@@ -34,7 +35,7 @@ private function init ()`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`if (! is_dir($this->referenceImageDir)) {`
`37`		`- mkdir($this->referenceImageDir, 0777);`
	`38`	`+ mkdir($this->referenceImageDir, 0666);`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`@@ -68,7 +69,7 @@ private function getScreenshotPath ($identifier)`
`68`	`69`	`{`
`69`	`70`	`$debugDir = \Codeception\Configuration::logDir() . 'debug/tmp/';`
`70`	`71`	`if (! is_dir($debugDir)) {`
`71`		`- mkdir($debugDir, 0777);`
	`72`	`+ mkdir($debugDir, 0666);`
`72`	`73`	`}`
`73`	`74`	`return $debugDir . $this->getScreenshotName($identifier);`
`74`	`75`	`}`