Merge branch 'master' into the-admin-can-be-reset-password

src/User/resources/views/registration/register.php

@@ -45,7 +45,7 @@ $this->params['breadcrumbs'][] = $this->title;
                     <?= $form->field($model, 'password')->passwordInput() ?>
                 <?php endif ?>
 
-                <?php if ($module->enableGDPRcompliance): ?>
+                <?php if ($module->enableGdprCompliance): ?>
                     <?= $form->field($model, 'gdpr_consent')->checkbox(['value' => 1]) ?>
                 <?php endif ?>
 

src/User/resources/views/settings/_menu.php

@@ -43,7 +43,7 @@ $networksVisible = count(Yii::$app->authClientCollection->clients) > 0;
                     ['label' => Yii::t('usuario', 'Account'), 'url' => ['/user/settings/account']],
                     ['label' => Yii::t('usuario', 'Privacy'),
                         'url' => ['/user/settings/privacy'],
-                        'visible' => $module->enableGDPRcompliance
+                        'visible' => $module->enableGdprCompliance
                     ],
                     [
                         'label' => Yii::t('usuario', 'Networks'),

src/User/resources/views/settings/networks.php

@@ -28,7 +28,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
 <div class="row">
     <div class="col-md-3">
-        <?= $this->render('/networks/_menu') ?>
+        <?= $this->render('/settings/_menu') ?>
     </div>
     <div class="col-md-9">
         <div class="panel panel-default">