diff --git a/protected/modules_core/user/controllers/AccountController.php b/protected/modules_core/user/controllers/AccountController.php index cad0b2aa07..d371d90b3a 100644 --- a/protected/modules_core/user/controllers/AccountController.php +++ b/protected/modules_core/user/controllers/AccountController.php @@ -216,7 +216,6 @@ class AccountController extends Controller $user = Yii::app()->user->getModel(); $model = new AccountEmailingForm(); - $model->receive_email_messaging = $user->getSetting("receive_email_messaging", 'core', User::RECEIVE_EMAIL_ALWAYS); $model->receive_email_activities = $user->getSetting("receive_email_activities", 'core', HSetting::Get('receive_email_activities', 'mailing')); $model->receive_email_notifications = $user->getSetting("receive_email_notifications", 'core', HSetting::Get('receive_email_notifications', 'mailing')); @@ -224,7 +223,6 @@ class AccountController extends Controller $model->attributes = Yii::app()->input->stripClean($_POST['AccountEmailingForm']); if ($model->validate()) { - $user->setSetting("receive_email_messaging", $model->receive_email_messaging); $user->setSetting("receive_email_activities", $model->receive_email_activities); $user->setSetting("receive_email_notifications", $model->receive_email_notifications); diff --git a/protected/modules_core/user/forms/AccountEmailingForm.php b/protected/modules_core/user/forms/AccountEmailingForm.php index d2d0232d5f..6c76109580 100644 --- a/protected/modules_core/user/forms/AccountEmailingForm.php +++ b/protected/modules_core/user/forms/AccountEmailingForm.php @@ -27,7 +27,6 @@ class AccountEmailingForm extends CFormModel { - public $receive_email_messaging; public $receive_email_activities; public $receive_email_notifications; @@ -37,7 +36,7 @@ class AccountEmailingForm extends CFormModel public function rules() { return array( - array('receive_email_messaging, receive_email_activities, receive_email_notifications', 'in', + array('receive_email_activities, receive_email_notifications', 'in', 'range' => array( User::RECEIVE_EMAIL_NEVER, User::RECEIVE_EMAIL_DAILY_SUMMARY, @@ -57,7 +56,6 @@ class AccountEmailingForm extends CFormModel { return array( 'receive_email_notifications' => Yii::t('UserModule.base', 'Send notifications?'), - 'receive_email_messaging' => Yii::t('UserModule.base', 'Send messages?'), 'receive_email_activities' => Yii::t('UserModule.base', 'Send activities?'), ); } diff --git a/protected/modules_core/user/views/account/emailing.php b/protected/modules_core/user/views/account/emailing.php index 9ffb8bfad8..fc64b5a568 100644 --- a/protected/modules_core/user/views/account/emailing.php +++ b/protected/modules_core/user/views/account/emailing.php @@ -38,17 +38,6 @@