Merge remote-tracking branch 'origin/master'

Martin Kluska · Martin Kluska · commit de45935b8ce1 · 2016-09-02T17:35:32.000+02:00
# Conflicts:
#	src/Save/ChunkSave.php
diff --git a/src/Save/ChunkSave.php b/src/Save/ChunkSave.php
@@ -230,6 +230,7 @@ public function chunkDisk()
      */
     protected function createChunksFolderIfNeeded()
     {
+
         // get the full path to the cunk directory
         $path = $this->getChunkDirectory(true);
 
@@ -238,4 +239,4 @@ protected function createChunksFolderIfNeeded()
             mkdir($path, 0777, true);
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,7 @@ public function chunkDisk()`
`230`	`230`	`*/`
`231`	`231`	`protected function createChunksFolderIfNeeded()`
`232`	`232`	`{`
	`233`	`+`
`233`	`234`	`// get the full path to the cunk directory`
`234`	`235`	`$path = $this->getChunkDirectory(true);`
`235`	`236`
`@@ -238,4 +239,4 @@ protected function createChunksFolderIfNeeded()`
`238`	`239`	`mkdir($path, 0777, true);`
`239`	`240`	`}`
`240`	`241`	`}`
`241`		`-}`
	`242`	`+}`