diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-19 17:08:16 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-19 17:08:16 +0200 |
| commit | 7cc2f8aa43eefda2a271b3b6e53c82a53beb988a (patch) | |
| tree | 0b47b3d157bfb2582d80c46cfb60561a24ca7857 /phpBB/includes | |
| parent | 7a4d6209fdd5a378a232856c81f0cb6708f7b6e5 (diff) | |
| parent | d550f925ab0232e1630fca5dc4c62f024abb7165 (diff) | |
| download | forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.gz forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.bz2 forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.tar.xz forums-7cc2f8aa43eefda2a271b3b6e53c82a53beb988a.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15151] Use redirected link for consistency
[ticket/15151] ACP Cookie settings explanatory text
[ticket/15151] ACP Cookie settings add explanatory text where it was missing
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 956ff7cf0f..9b5078b941 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -320,9 +320,9 @@ class acp_board 'title' => 'ACP_COOKIE_SETTINGS', 'vars' => array( 'legend1' => 'ACP_COOKIE_SETTINGS', - 'cookie_domain' => array('lang' => 'COOKIE_DOMAIN', 'validate' => 'string', 'type' => 'text::255', 'explain' => false), - 'cookie_name' => array('lang' => 'COOKIE_NAME', 'validate' => 'string', 'type' => 'text::16', 'explain' => false), - 'cookie_path' => array('lang' => 'COOKIE_PATH', 'validate' => 'string', 'type' => 'text::255', 'explain' => false), + 'cookie_domain' => array('lang' => 'COOKIE_DOMAIN', 'validate' => 'string', 'type' => 'text::255', 'explain' => true), + 'cookie_name' => array('lang' => 'COOKIE_NAME', 'validate' => 'string', 'type' => 'text::16', 'explain' => true), + 'cookie_path' => array('lang' => 'COOKIE_PATH', 'validate' => 'string', 'type' => 'text::255', 'explain' => true), 'cookie_secure' => array('lang' => 'COOKIE_SECURE', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), 'cookie_notice' => array('lang' => 'COOKIE_NOTICE', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), ) |