diff options
author | Dhruv <dhruv.goel92@gmail.com> | 2013-07-01 23:25:29 +0530 |
---|---|---|
committer | Dhruv <dhruv.goel92@gmail.com> | 2013-07-01 23:25:29 +0530 |
commit | c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1 (patch) | |
tree | 5aae5584dd9fc1aed161bc4391865c8263486522 /phpBB/includes/constants.php | |
parent | 8233c3e340a3608a6952ef444143a10e668d6561 (diff) | |
parent | 045e04fb6fa55ae96ba82245010a684cd2d61e5d (diff) | |
download | forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.gz forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.bz2 forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.tar.xz forums-c80b80ca0f4328124bc4f2e8fdf9374aff06b7e1.zip |
Merge branch 'ticket/11566' into ticket/11566-develop
* ticket/11566:
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
Conflicts:
phpBB/report.php
Diffstat (limited to 'phpBB/includes/constants.php')
-rw-r--r-- | phpBB/includes/constants.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 8c27d3fd0c..96011f4ec5 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -156,6 +156,7 @@ define('PHYSICAL_LINK', 2); define('CONFIRM_REG', 1); define('CONFIRM_LOGIN', 2); define('CONFIRM_POST', 3); +define('CONFIRM_REPORT', 4); // Categories - Attachments define('ATTACHMENT_CATEGORY_NONE', 0); |