diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 14:01:23 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-21 14:01:23 -0800 |
| commit | df7fa8e4991a4b4fe439371c5d433b4e59996205 (patch) | |
| tree | cbc14e92ace5a292ddb17889f2cdbcaa160c3188 /phpBB/includes/acp/acp_users.php | |
| parent | be33d37c897510e5d6b51780d838114664c2565c (diff) | |
| parent | a353673e7c3e5a5a4720bea008e1df60c1401ae2 (diff) | |
| download | forums-df7fa8e4991a4b4fe439371c5d433b4e59996205.tar forums-df7fa8e4991a4b4fe439371c5d433b4e59996205.tar.gz forums-df7fa8e4991a4b4fe439371c5d433b4e59996205.tar.bz2 forums-df7fa8e4991a4b4fe439371c5d433b4e59996205.tar.xz forums-df7fa8e4991a4b4fe439371c5d433b4e59996205.zip | |
Merge pull request #1854 from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 6b86cb4a5a..fbc1cc1f14 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'], |