Use config_get_global for cookie_path

Issue #23626
mantisbt · Nov 13, 2017 · 5c86cd8 · 5c86cd8
1 parent 16aa170
commit 5c86cd8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/core/authentication_api.php b/core/authentication_api.php
@@ -849,7 +849,7 @@ function auth_clear_cookies() {
 	# clear cookie, if not logged in from script
 	if( $g_script_login_cookie == null ) {
 		$t_cookie_name = config_get( 'string_cookie' );
-		$t_cookie_path = config_get( 'cookie_path' );
+		$t_cookie_path = config_get_global( 'cookie_path' );
 
 		gpc_clear_cookie( $t_cookie_name, $t_cookie_path );
 		$t_cookies_cleared = true;
@@ -1162,7 +1162,7 @@ function auth_http_set_logout_pending( $p_pending ) {
 	if( $p_pending ) {
 		gpc_set_cookie( $t_cookie_name, '1', false );
 	} else {
-		$t_cookie_path = config_get( 'cookie_path' );
+		$t_cookie_path = config_get_global( 'cookie_path' );
 		gpc_clear_cookie( $t_cookie_name, $t_cookie_path );
 	}
 }

diff --git a/core/gpc_api.php b/core/gpc_api.php
@@ -377,7 +377,7 @@ function gpc_set_cookie( $p_name, $p_value, $p_expire = false, $p_path = null, $
 	}
 
 	if( null === $p_path ) {
-		$p_path = config_get( 'cookie_path' );
+		$p_path = config_get_global( 'cookie_path' );
 	}
 
 	if( null === $p_domain ) {
@@ -396,7 +396,7 @@ function gpc_set_cookie( $p_name, $p_value, $p_expire = false, $p_path = null, $
  */
 function gpc_clear_cookie( $p_name, $p_path = null, $p_domain = null ) {
 	if( null === $p_path ) {
-		$p_path = config_get( 'cookie_path' );
+		$p_path = config_get_global( 'cookie_path' );
 	}
 	if( null === $p_domain ) {
 		$p_domain = config_get( 'cookie_domain' );

diff --git a/core/session_api.php b/core/session_api.php
@@ -110,7 +110,7 @@ function __construct( $p_session_id = null ) {
 
 		# Handle session cookie and caching
 		session_cache_limiter( 'private_no_expire' );
-		session_set_cookie_params( 0, config_get( 'cookie_path' ), config_get( 'cookie_domain' ), $g_cookie_secure_flag_enabled, true );
+		session_set_cookie_params( 0, config_get_global( 'cookie_path' ), config_get( 'cookie_domain' ), $g_cookie_secure_flag_enabled, true );
 
 		# Handle existent session ID
 		if( !is_null( $p_session_id ) ) {

diff --git a/search.php b/search.php
@@ -157,7 +157,7 @@
 $t_row_id = filter_db_set_for_current_user( $t_project_id, false, '', $t_settings_string );
 
 # set cookie values
-gpc_set_cookie( config_get( 'view_all_cookie' ), $t_row_id, time()+config_get_global( 'cookie_time_length' ), config_get( 'cookie_path' ) );
+gpc_set_cookie( config_get( 'view_all_cookie' ), $t_row_id, time()+config_get_global( 'cookie_time_length' ), config_get_global( 'cookie_path' ) );
 
 # redirect to print_all or view_all page
 if( $f_print ) {

diff --git a/view_all_set.php b/view_all_set.php
@@ -225,7 +225,7 @@
 	$t_row_id = filter_db_set_for_current_user( $t_project_id, false, '', $t_settings_string );
 
 	# set cookie values
-	gpc_set_cookie( config_get( 'view_all_cookie' ), $t_row_id, time()+config_get_global( 'cookie_time_length' ), config_get( 'cookie_path' ) );
+	gpc_set_cookie( config_get( 'view_all_cookie' ), $t_row_id, time()+config_get_global( 'cookie_time_length' ), config_get_global( 'cookie_path' ) );
 }
 
 # redirect to print_all or view_all page