aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/user.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/phpbb/user.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/phpbb/user.php')
-rw-r--r--phpBB/phpbb/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index ce0dc3c1df..b2ab187a70 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -36,7 +36,7 @@ class user extends \phpbb\session
var $img_array = array();
// Able to add new options (up to id 31)
- var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17);
+ var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17);
/**
* Constructor to set the lang path