kopia lustrzana https://github.com/pixelfed/pixelfed
Update config() to config_cache()
rodzic
7873b7ecc5
commit
f4fc8347c9
|
@ -55,7 +55,7 @@ trait HomeSettings
|
|||
$layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
|
||||
}
|
||||
|
||||
$enforceEmailVerification = config('pixelfed.enforce_email_verification');
|
||||
$enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
|
||||
|
||||
// Only allow email to be updated if not yet verified
|
||||
if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
|
||||
|
@ -152,7 +152,7 @@ trait HomeSettings
|
|||
$user = Auth::user();
|
||||
$profile = $user->profile;
|
||||
|
||||
$validate = config('pixelfed.enforce_email_verification');
|
||||
$validate = config_cache('pixelfed.enforce_email_verification');
|
||||
|
||||
if ($user->email != $email) {
|
||||
$changes = true;
|
||||
|
|
|
@ -6,31 +6,31 @@ use Closure;
|
|||
|
||||
class EmailVerificationCheck
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if ($request->user() &&
|
||||
config('pixelfed.enforce_email_verification') &&
|
||||
is_null($request->user()->email_verified_at) &&
|
||||
!$request->is(
|
||||
'i/auth/*',
|
||||
'i/verify-email',
|
||||
'log*',
|
||||
'i/confirm-email/*',
|
||||
'settings/home',
|
||||
'settings/email'
|
||||
)
|
||||
) {
|
||||
return redirect('/i/verify-email');
|
||||
}
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if ($request->user() &&
|
||||
config_cache('pixelfed.enforce_email_verification') &&
|
||||
is_null($request->user()->email_verified_at) &&
|
||||
!$request->is(
|
||||
'i/auth/*',
|
||||
'i/verify-email',
|
||||
'log*',
|
||||
'i/confirm-email/*',
|
||||
'settings/home',
|
||||
'settings/email'
|
||||
)
|
||||
) {
|
||||
return redirect('/i/verify-email');
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<li>Go to <a href="{{config('app.url')}}">{{config('app.url')}}</a>.</li>
|
||||
<li>Click on the register link at the top of the page.</li>
|
||||
<li>Enter your name, email address, username and password.</li>
|
||||
@if(config('pixelfed.enforce_email_verification') != true)
|
||||
@if(config_cache('pixelfed.enforce_email_verification') != true)
|
||||
<li>Wait for an account verification email, it may take a few minutes.</li>
|
||||
@endif
|
||||
</ol>
|
||||
|
|
Ładowanie…
Reference in New Issue