Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make setSessionCookie protected, correct _sessionStart regression #785

Closed
wants to merge 1 commit into from

Conversation

cpjolly
Copy link
Contributor

@cpjolly cpjolly commented Mar 31, 2020

This PR implements the requested changes and replaces PR #782. It also corrects a regression.

  1. Make the setSessionCookie function protected, so that modules that extend Session can modify the parameters passed to setOxCookie, for example to change the session lifetime.

  2. Add a standard comment header to setSessionCookie.

  3. Correct a regression in _sessionStart between master and b-6.2.x, where some redundant code that is removed in master has reappeared.
    See lines 313-318 in
    https://github.com/OXID-eSales/oxideshop_ce/blob/master/source/Core/Session.php
    See lines 312-329 in
    https://github.com/OXID-eSales/oxideshop_ce/blob/b-6.2.x/source/Core/Session.php

Make the setSessionCookie function protected, so that modules that
extend Session can modify the parameters passed to setOxCookie, for
example to change the session lifetime.

Correct a regression in _sessionStart between master and b-6.2.x,
where some redundant code that is removed in master has reappeared.
See lines 313-318 in https://github.com/OXID-eSales/oxideshop_ce/blob/master/source/Core/Session.php
See lines 312-329 in https://github.com/OXID-eSales/oxideshop_ce/blob/b-6.2.x/source/Core/Session.php
@realFlowControl realFlowControl changed the base branch from master to b-6.2.x March 31, 2020 11:45
Sieg pushed a commit that referenced this pull request Apr 1, 2020
Fixes _sessionStart regression

Make the setSessionCookie function protected, so that modules that
extend Session can modify the parameters passed to setOxCookie, for
example to change the session lifetime.

Related #785
Sieg added a commit that referenced this pull request Apr 1, 2020
@Sieg
Copy link
Member

Sieg commented Apr 1, 2020

Hey @cpjolly! Thanks for your try to rebase it! :) I have fixed the problem with _sessionStart code, and merged at 1a22016. Have a nice day!

@Sieg Sieg closed this Apr 1, 2020
@cpjolly
Copy link
Contributor Author

cpjolly commented Apr 1, 2020

Many thanks @Sieg and @flow-control .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants