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/functions.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/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 35fa785616..3a915de82b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5358,7 +5358,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'U_PRIVATEMSGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'U_RETURN_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), - 'U_POPUP_PM' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup'), 'U_MEMBERLIST' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), 'U_VIEWONLINE' => ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '', 'U_LOGIN_LOGOUT' => $u_login_logout, @@ -5386,7 +5385,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false, 'S_REGISTERED_USER' => (!empty($user->data['is_registered'])) ? true : false, 'S_IS_BOT' => (!empty($user->data['is_bot'])) ? true : false, - 'S_USER_PM_POPUP' => $user->optionget('popuppm'), 'S_USER_LANG' => $user_lang, 'S_USER_BROWSER' => (isset($user->data['session_browser'])) ? $user->data['session_browser'] : $user->lang['UNKNOWN_BROWSER'], 'S_USERNAME' => $user->data['username'], |