Completed
Push — master ( a84219...f4255b )
by Xu
744:00 queued 703:48
created
src/user/views/settings/networks.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,7 @@
 block discarded – undo
45 45
                                     Html::a(Yii::t('user', 'Disconnect'), $auth->createClientUrl($client), [
46 46
                                         'class' => 'btn btn-danger btn-block',
47 47
                                         'data-method' => 'post',
48
-                                    ]) :
49
-                                    Html::a(Yii::t('user', 'Connect'), $auth->createClientUrl($client), [
48
+                                    ]) : Html::a(Yii::t('user', 'Connect'), $auth->createClientUrl($client), [
50 49
                                         'class' => 'btn btn-success btn-block',
51 50
                                     ])
52 51
                                 ?>
Please login to merge, or discard this patch.
src/user/views/security/login.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,11 +24,11 @@
 block discarded – undo
24 24
         'autocomplete' => 'off',
25 25
         'autofocus' => 'autofocus',
26 26
         'tabindex' => '1',
27
-        'placeholder' => Yii::t('user','Please enter your email address / phone number.'),
27
+        'placeholder' => Yii::t('user', 'Please enter your email address / phone number.'),
28 28
         'required' => true,
29 29
     ]]) ?>
30 30
 
31
-    <?= $form->field($model, 'password', ['inputOptions' => ['autocomplete' => 'off','required' => true, 'tabindex' => '2']])->passwordInput()->label(Yii::t('user', 'Password') . (Yii::$app->settings->get('enablePasswordRecovery', 'user') ? ' (' . Html::a(Yii::t('user', 'Forgot password?'), ['/user/recovery/request'], ['tabindex' => '5']) . ')' : '')) ?>
31
+    <?= $form->field($model, 'password', ['inputOptions' => ['autocomplete' => 'off', 'required' => true, 'tabindex' => '2']])->passwordInput()->label(Yii::t('user', 'Password') . (Yii::$app->settings->get('enablePasswordRecovery', 'user') ? ' (' . Html::a(Yii::t('user', 'Forgot password?'), ['/user/recovery/request'], ['tabindex' => '5']) . ')' : '')) ?>
32 32
 
33 33
     <?= $form->field($model, 'rememberMe', [
34 34
         'options' => [
Please login to merge, or discard this patch.
src/user/controllers/SecurityController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
                 Yii::$app->session->setFlash('danger', Yii::t('yuncms', 'Your account has been blocked.'));
133 133
                 $this->action->successUrl = Url::to(['/user/security/login']);
134 134
             } else {
135
-                Yii::$app->user->login($account->user, Yii::$app->settings->get('rememberFor','user'));
135
+                Yii::$app->user->login($account->user, Yii::$app->settings->get('rememberFor', 'user'));
136 136
                 $this->action->successUrl = Yii::$app->getUser()->getReturnUrl();
137 137
             }
138 138
         } else {
Please login to merge, or discard this patch.