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

Use https in Employee not http #9136

Merged
merged 2 commits into from May 29, 2018

Conversation

Projects
None yet
7 participants
@okom3pom
Contributor

okom3pom commented May 28, 2018

Questions Answers
Branch? develop
Description? Use https
Type? improvement
Category? CO
BC breaks? no
Deprecations? no

This change is Reviewable

FROM `'._DB_PREFIX_.'module_preference`
WHERE `id_employee` = '.(int)$this->id.' AND `favorite` = 1 AND (`interest` = 1 OR `interest` IS NULL)'
);
SELECT `module`

This comment has been minimized.

@PierreRambaud

PierreRambaud May 29, 2018

Contributor

Why did you change the indentation?

This comment has been minimized.

@PierreRambaud

PierreRambaud May 29, 2018

Contributor

This one look really good, https://github.com/PrestaShop/PrestaShop/blob/develop/classes/Employee.php#L304
It's PSR2 / Symfony style compliant :)

@marionf marionf added QA ✔️ and removed waiting for QA labels May 29, 2018

@mickaelandrieu

This comment has been minimized.

Contributor

mickaelandrieu commented May 29, 2018

"Make ident grat again" => ahahah don't worry we can change the git label name :)

Thansk @okom3pom

@okom3pom

This comment has been minimized.

Contributor

okom3pom commented May 29, 2018

oh !

@mickaelandrieu mickaelandrieu merged commit cbcabc2 into PrestaShop:develop May 29, 2018

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mickaelandrieu

This comment has been minimized.

Contributor

mickaelandrieu commented May 29, 2018

and merged!

Thanks @okom3pom

@okom3pom okom3pom deleted the okom3pom:okom-17-patch branch May 29, 2018

mickaelandrieu added a commit to mickaelandrieu/PrestaShop that referenced this pull request May 30, 2018

Use https in Employee not http (PrestaShop#9136)
* Use https instead of http in Employee class

* Make ident great again

@eternoendless eternoendless added this to the 1.7.5.0 milestone Jun 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment