Completed
Push — master ( a914d0...1efc1c )
by satoru
06:57
created
src/Controller/ContentsFileController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
             Configure::write('ContentsFile.Setting.S3.fileDir', Configure::read('ContentsFile.Setting.S3.fileDir') . '/');
36 36
         }
37 37
         if (!preg_match('#/$#', Configure::read('ContentsFile.Setting.S3.workingDir'))) {
38
-            Configure::write('ContentsFile.Setting.S3.workingDir', Configure::read('ContentsFile.Setting.S3.workingDir'). '/');
38
+            Configure::write('ContentsFile.Setting.S3.workingDir', Configure::read('ContentsFile.Setting.S3.workingDir') . '/');
39 39
         }
40 40
     }
41 41
 
Please login to merge, or discard this patch.
src/Model/Behavior/Traits/S3ContentsFileBehaviorTrait.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
             $deleteField = $attachmentData->field_name;
121 121
         }
122 122
 
123
-       $S3 = new S3();
123
+        $S3 = new S3();
124 124
         // リサイズのディレクトリ
125 125
         $resizeDir = Configure::read('ContentsFile.Setting.S3.fileDir') . $modelName . '/' . $modelId . '/' . 'contents_file_resize_' . $deleteField . '/';
126 126
         if (!$S3->deleteRecursive($resizeDir)) {
Please login to merge, or discard this patch.
src/Model/Behavior/Traits/ImageContentsFileBehaviorTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -158,8 +158,8 @@
 block discarded – undo
158 158
         switch ($imagetype) {
159 159
             case IMAGETYPE_GIF:
160 160
                 //透過GIF対策
161
-                $alpha = imagecolortransparent($image);  // 元画像から透過色を取得する
162
-                imagefill($outImage, 0, 0, $alpha);       // その色でキャンバスを塗りつぶす
161
+                $alpha = imagecolortransparent($image); // 元画像から透過色を取得する
162
+                imagefill($outImage, 0, 0, $alpha); // その色でキャンバスを塗りつぶす
163 163
                 imagecolortransparent($outImage, $alpha); // 塗りつぶした色を透過色として指定する
164 164
                 //!透過GIF対策
165 165
                 break;
Please login to merge, or discard this patch.