Attachment #40696 for bug #14121

View | Details | Raw Unified | Return to bug 14121
Collapse All | Expand All




                        C4::Context->preference('staffClientBaseURL');

    my $uri_params_part = '';
    foreach my $param ( $query->url_param() ) {
        # url_param() always returns parameters that were deleted by delete()
        # This additional check ensure that parameter was not deleted.
        my $uriPiece = $query->param($param);
        if ($uriPiece) {
            $uri_params_part .= '&' if $uri_params_part;
            $uri_params_part .= $param . '=';
            $uri_params_part .= URI::Escape::uri_escape( $uriPiece );
        }
    }
    $uri_base_part .= '?' if $uri_params_part;

Lines 38-43 my $dbh = C4::Context->dbh; Link Here

(-)a/t/db_dependent/Auth_with_cas.t (-1 / +1 lines)
38	$dbh->{ AutoCommit } = 0;	38	$dbh->{ AutoCommit } = 0;
39	$dbh->{ RaiseError } = 1;	39	$dbh->{ RaiseError } = 1;
40		40
		41	C4::Context->disable_syspref_cache();
41	C4::Context->set_preference('OPACBaseURL','http://localhost');	42	C4::Context->set_preference('OPACBaseURL','http://localhost');
42	C4::Context->set_preference('staffClientBaseURL','localhost:8080');	43	C4::Context->set_preference('staffClientBaseURL','localhost:8080');
43		44
44	-

Return to bug 14121

Lines 208-220 sub _url_with_get_params { Link Here

(-)a/C4/Auth_with_cas.pm (-4 / +5 lines)
208	C4::Context->preference('staffClientBaseURL');	208	C4::Context->preference('staffClientBaseURL');
209		209
210	my $uri_params_part = '';	210	my $uri_params_part = '';
211	foreach ( $query->url_param() ) {	211	foreach my $param ( $query->url_param() ) {
212	# url_param() always returns parameters that were deleted by delete()	212	# url_param() always returns parameters that were deleted by delete()
213	# This additional check ensure that parameter was not deleted.	213	# This additional check ensure that parameter was not deleted.
214	if ($query->param($_)) {	214	my $uriPiece = $query->param($param);
		215	if ($uriPiece) {
215	$uri_params_part .= '&' if $uri_params_part;	216	$uri_params_part .= '&' if $uri_params_part;
216	$uri_params_part .= $_ . '=';	217	$uri_params_part .= $param . '=';
217	$uri_params_part .= URI::Escape::uri_escape( $query->param($_) );	218	$uri_params_part .= URI::Escape::uri_escape( $uriPiece );
218	}	219	}
219	}	220	}
220	$uri_base_part .= '?' if $uri_params_part;	221	$uri_base_part .= '?' if $uri_params_part;