diff options
| author | Lukasz <luki_9@wp.pl> | 2013-11-07 19:52:27 +0100 |
|---|---|---|
| committer | Lukasz <luki_9@wp.pl> | 2013-11-08 21:57:03 +0100 |
| commit | 57ec9ee49e95fa45f8c5c441b4ed05095c3918a8 (patch) | |
| tree | 70b163f8967ddfb1a64971c95087db6a41988ceb /phpBB | |
| parent | 0a3bb18e93bcb8321e09ca313431ae66f2284e7b (diff) | |
| download | forums-57ec9ee49e95fa45f8c5c441b4ed05095c3918a8.tar forums-57ec9ee49e95fa45f8c5c441b4ed05095c3918a8.tar.gz forums-57ec9ee49e95fa45f8c5c441b4ed05095c3918a8.tar.bz2 forums-57ec9ee49e95fa45f8c5c441b4ed05095c3918a8.tar.xz forums-57ec9ee49e95fa45f8c5c441b4ed05095c3918a8.zip | |
[ticket/12005] Remove PM popup setting from user preferences
PHPBB3-12005
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_users_prefs.html | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index f1b9e28a66..1092b25b04 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -40,11 +40,6 @@ <label><input type="radio" class="radio" name="notifypm" value="0"<!-- IF not NOTIFY_PM --> id="notifypm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> </dl> <dl> - <dt><label for="popuppm">{L_POPUP_ON_PM}{L_COLON}</label></dt> - <dd><label><input type="radio" class="radio" name="popuppm" value="1"<!-- IF POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_YES}</label> - <label><input type="radio" class="radio" name="popuppm" value="0"<!-- IF not POPUP_PM --> id="popuppm" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd> - </dl> - <dl> <dt><label for="lang">{L_BOARD_LANGUAGE}{L_COLON}</label></dt> <dd><select id="lang" name="lang">{S_LANG_OPTIONS}</select></dd> </dl> diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index fd9c17f171..c476b06c75 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1512,7 +1512,6 @@ class acp_users 'hideonline' => request_var('hideonline', !$user_row['user_allow_viewonline']), 'notifymethod' => request_var('notifymethod', $user_row['user_notify_type']), 'notifypm' => request_var('notifypm', $user_row['user_notify_pm']), - 'popuppm' => request_var('popuppm', $this->optionget($user_row, 'popuppm')), 'allowpm' => request_var('allowpm', $user_row['user_allow_pm']), 'topic_sk' => request_var('topic_sk', ($user_row['user_topic_sortby_type']) ? $user_row['user_topic_sortby_type'] : 't'), @@ -1556,7 +1555,6 @@ class acp_users if (!sizeof($error)) { - $this->optionset($user_row, 'popuppm', $data['popuppm']); $this->optionset($user_row, 'viewimg', $data['view_images']); $this->optionset($user_row, 'viewflash', $data['view_flash']); $this->optionset($user_row, 'viewsmilies', $data['view_smilies']); @@ -1699,7 +1697,6 @@ class acp_users 'NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false, 'NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false, 'NOTIFY_PM' => $data['notifypm'], - 'POPUP_PM' => $data['popuppm'], 'BBCODE' => $data['bbcode'], 'SMILIES' => $data['smilies'], 'ATTACH_SIG' => $data['sig'], |