diff options
author | Andreas Fischer <bantu@phpbb.com> | 2010-07-07 12:09:04 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-07 12:09:04 +0200 |
commit | 4ac5d5e3527da561c37e24e778bd6dad23e1bf83 (patch) | |
tree | b021228f6456b2c2a218141d9dae98149b509bbc | |
parent | b7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (diff) | |
parent | b64f456c40f5c0c5e5438fea8a864934e3b3fcf8 (diff) | |
download | forums-4ac5d5e3527da561c37e24e778bd6dad23e1bf83.tar forums-4ac5d5e3527da561c37e24e778bd6dad23e1bf83.tar.gz forums-4ac5d5e3527da561c37e24e778bd6dad23e1bf83.tar.bz2 forums-4ac5d5e3527da561c37e24e778bd6dad23e1bf83.tar.xz forums-4ac5d5e3527da561c37e24e778bd6dad23e1bf83.zip |
Merge branch 'ticket/naderman/9659' into develop-olympus
* ticket/naderman/9659:
[ticket/9659] Signature options in set_user_options
-rw-r--r-- | phpBB/includes/functions_convert.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 0fdae9b274..c035fd3739 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1025,6 +1025,9 @@ function set_user_options() '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), ); $option_field = 0; |