fix error with str_singular() helper

streamtw · streamtw · commit aaf2764f26eb · 2018-07-05T19:36:08.000+08:00
diff --git a/src/Traits/LfmHelpers.php b/src/Traits/LfmHelpers.php
@@ -332,7 +332,7 @@ public function translateToUtf8($input)
      */
     public function isProcessingImages()
     {
-        return lcfirst(str_singular(request('type', ''))) === 'image';
+        return lcfirst(str_singular(request('type', '') ?: '')) === 'image';
     }
 
     /**
diff --git a/src/views/index.blade.php b/src/views/index.blade.php
@@ -206,8 +206,8 @@
           }
       });
       },
-      acceptedFiles: "{{ lcfirst(str_singular(request('type'))) == 'image' ? implode(',', config('lfm.valid_image_mimetypes')) : implode(',', config('lfm.valid_file_mimetypes')) }}",
-      maxFilesize: ({{ lcfirst(str_singular(request('type'))) == 'image' ? config('lfm.max_image_size') : config('lfm.max_file_size') }} / 1000)
+      acceptedFiles: "{{ lcfirst(str_singular(request('type') ?: '')) == 'image' ? implode(',', config('lfm.valid_image_mimetypes')) : implode(',', config('lfm.valid_file_mimetypes')) }}",
+      maxFilesize: ({{ lcfirst(str_singular(request('type') ?: '')) == 'image' ? config('lfm.max_image_size') : config('lfm.max_file_size') }} / 1000)
     }
   </script>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function translateToUtf8($input)`
`332`	`332`	`*/`
`333`	`333`	`public function isProcessingImages()`
`334`	`334`	`{`
`335`		`- return lcfirst(str_singular(request('type', ''))) === 'image';`
	`335`	`+ return lcfirst(str_singular(request('type', '') ?: '')) === 'image';`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,8 @@`
`206`	`206`	`}`
`207`	`207`	`});`
`208`	`208`	`},`
`209`		`- acceptedFiles: "{{ lcfirst(str_singular(request('type'))) == 'image' ? implode(',', config('lfm.valid_image_mimetypes')) : implode(',', config('lfm.valid_file_mimetypes')) }}",`
`210`		`- maxFilesize: ({{ lcfirst(str_singular(request('type'))) == 'image' ? config('lfm.max_image_size') : config('lfm.max_file_size') }} / 1000)`
	`209`	`+ acceptedFiles: "{{ lcfirst(str_singular(request('type') ?: '')) == 'image' ? implode(',', config('lfm.valid_image_mimetypes')) : implode(',', config('lfm.valid_file_mimetypes')) }}",`
	`210`	`+ maxFilesize: ({{ lcfirst(str_singular(request('type') ?: '')) == 'image' ? config('lfm.max_image_size') : config('lfm.max_file_size') }} / 1000)`
`211`	`211`	`}`
`212`	`212`	`</script>`
`213`	`213`	`</body>`