diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 00:20:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 00:20:18 +0100 |
| commit | 44f130808fc8ce9d125094d5294355d2b014014a (patch) | |
| tree | befb81e1a7022af32452871677629bbba63fdd04 /phpBB/includes | |
| parent | e096137537d1526ae914c73c66619cd1821c2f7a (diff) | |
| parent | 743d3af3c52f21a47795b76598b0136ad261839a (diff) | |
| download | forums-44f130808fc8ce9d125094d5294355d2b014014a.tar forums-44f130808fc8ce9d125094d5294355d2b014014a.tar.gz forums-44f130808fc8ce9d125094d5294355d2b014014a.tar.bz2 forums-44f130808fc8ce9d125094d5294355d2b014014a.tar.xz forums-44f130808fc8ce9d125094d5294355d2b014014a.zip | |
Merge pull request #4618 from marc1706/ticket/14961
[ticket/14961] Add cookie notice as enablable feature
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 02af98ec54..826d0007b7 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -323,6 +323,7 @@ class acp_board '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_secure' => array('lang' => 'COOKIE_SECURE', 'validate' => 'bool', 'type' => 'radio:disabled_enabled', 'explain' => true), + 'cookie_notice' => array('lang' => 'COOKIE_NOTICE', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), ) ); break; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 39d22254a2..3dabd1b46e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4454,6 +4454,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'], 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.min.js?assets_version=" . $config['assets_version'], 'S_ALLOW_CDN' => !empty($config['allow_cdn']), + 'S_COOKIE_NOTICE' => !empty($config['cookie_notice']), 'T_THEME_NAME' => rawurlencode($user->style['style_path']), 'T_THEME_LANG_NAME' => $user->data['user_lang'], |