aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_convert.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-11-21 14:01:23 -0800
committerNathan Guse <nathaniel.guse@gmail.com>2013-11-21 14:01:23 -0800
commitdf7fa8e4991a4b4fe439371c5d433b4e59996205 (patch)
treecbc14e92ace5a292ddb17889f2cdbcaa160c3188 /phpBB/includes/functions_convert.php
parentbe33d37c897510e5d6b51780d838114664c2565c (diff)
parenta353673e7c3e5a5a4720bea008e1df60c1401ae2 (diff)
downloadforums-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_convert.php')
-rw-r--r--phpBB/includes/functions_convert.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 3eeecd038d..1646c79161 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1027,7 +1027,6 @@ function set_user_options()
'attachsig' => array('bit' => 6, 'default' => 0),
'bbcode' => array('bit' => 8, 'default' => 1),
'smilies' => array('bit' => 9, 'default' => 1),
- 'popuppm' => array('bit' => 10, 'default' => 0),
'sig_bbcode' => array('bit' => 15, 'default' => 1),
'sig_smilies' => array('bit' => 16, 'default' => 1),
'sig_links' => array('bit' => 17, 'default' => 1),