composer update
This commit is contained in:
@@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '5.6.38';
|
||||
const VERSION = '5.6.39';
|
||||
|
||||
/**
|
||||
* The base path for the Laravel installation.
|
||||
|
@@ -53,12 +53,12 @@
|
||||
@component('mail::subcopy')
|
||||
@lang(
|
||||
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
|
||||
'into your web browser: [:actionURL](:actionURL)',
|
||||
'into your web browser: ',
|
||||
[
|
||||
'actionText' => $actionText,
|
||||
'actionURL' => $actionUrl
|
||||
'actionText' => $actionText
|
||||
]
|
||||
)
|
||||
[{{ $actionUrl }}]({!! $actionUrl !!})
|
||||
@endcomponent
|
||||
@endisset
|
||||
@endcomponent
|
||||
|
@@ -18,7 +18,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"doctrine/inflector": "~1.1",
|
||||
"illuminate/contracts": "5.6.*",
|
||||
"nesbot/carbon": "^1.24.1"
|
||||
"nesbot/carbon": "1.25.*"
|
||||
},
|
||||
"conflict": {
|
||||
"tightenco/collect": "<5.5.33"
|
||||
|
@@ -18,7 +18,7 @@ trait CompilesTranslations
|
||||
return "<?php \$__env->startTranslation{$expression}; ?>";
|
||||
}
|
||||
|
||||
return "<?php echo e(app('translator')->getFromJson{$expression}); ?>";
|
||||
return "<?php echo app('translator')->getFromJson{$expression}; ?>";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -28,7 +28,7 @@ trait CompilesTranslations
|
||||
*/
|
||||
protected function compileEndlang()
|
||||
{
|
||||
return '<?php echo e($__env->renderTranslation()); ?>';
|
||||
return '<?php echo $__env->renderTranslation(); ?>';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -39,6 +39,6 @@ trait CompilesTranslations
|
||||
*/
|
||||
protected function compileChoice($expression)
|
||||
{
|
||||
return "<?php echo e(app('translator')->choice{$expression}); ?>";
|
||||
return "<?php echo app('translator')->choice{$expression}; ?>";
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user