Skip to content

Commit

Permalink
Remove Mail Date and Time option from Mail Settings - closes #3380
Browse files Browse the repository at this point in the history
  • Loading branch information
freescout-help-desk committed Sep 12, 2023
1 parent 547b05d commit b6c015e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions app/Http/Controllers/SettingsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ public function getSectionParams($section, $param = '')
'safe_password' => true,
'encrypt' => true,
],
'use_mail_date_on_fetching' => [
'env' => 'APP_USE_MAIL_DATE_ON_FETCHING',
],
// 'use_mail_date_on_fetching' => [
// 'env' => 'APP_USE_MAIL_DATE_ON_FETCHING',
// ],
],
];
break;
Expand Down Expand Up @@ -217,7 +217,7 @@ public function getSectionSettings($section)
'mail_password' => \Helper::decrypt(Option::get('mail_password', \Config::get('mail.password'))),
'mail_encryption' => Option::get('mail_encryption', \Config::get('mail.encryption')),
'fetch_schedule' => config('app.fetch_schedule'),
'use_mail_date_on_fetching' => config('app.use_mail_date_on_fetching'),
//'use_mail_date_on_fetching' => config('app.use_mail_date_on_fetching'),
];
break;
case 'alerts':
Expand Down
4 changes: 2 additions & 2 deletions resources/views/settings/emails.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</div>
</div>

<div class="form-group{{ $errors->has('settings[use_mail_date_on_fetching]') ? ' has-error' : '' }}">
{{--<div class="form-group{{ $errors->has('settings[use_mail_date_on_fetching]') ? ' has-error' : '' }}">
<label for="use_mail_date_on_fetching" class="col-sm-2 control-label">{{ __('Mail Date & Time') }}</label>
<div class="col-sm-6">
Expand All @@ -137,7 +137,7 @@
@include('partials/field_error', ['field'=>'settings.use_mail_date_on_fetching'])
</div>
</div>
</div>--}}

<div class="form-group margin-top">
<div class="col-sm-6 col-sm-offset-2">
Expand Down

0 comments on commit b6c015e

Please sign in to comment.