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/phpbb | |
| 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/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/ucp_popuppm_module.php | 42 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 2 |
2 files changed, 43 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/ucp_popuppm_module.php b/phpBB/phpbb/db/migration/data/v310/ucp_popuppm_module.php new file mode 100644 index 0000000000..f8ada6c6f5 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/ucp_popuppm_module.php @@ -0,0 +1,42 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +namespace phpbb\db\migration\data\v310; + +class ucp_popuppm_module extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + $sql = 'SELECT module_id + FROM ' . MODULES_TABLE . " + WHERE module_class = 'ucp' + AND module_langname = 'UCP_PM_POPUP_TITLE'"; + $result = $this->db->sql_query($sql); + $module_id = $this->db->sql_fetchfield('module_id'); + $this->db->sql_freeresult($result); + + return $module_id == false; + } + + static public function depends_on() + { + return array('\phpbb\db\migration\data\v310\dev'); + } + + public function update_data() + { + return array( + array('module.remove', array( + 'ucp', + 'UCP_PM', + 'UCP_PM_POPUP_TITLE', + )), + ); + } +} 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 |