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.

Sign up for GitHub

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

Fix probable boolean logic error #13200

Merged
merged 1 commit into from
Dec 28, 2017
Merged

Fix probable boolean logic error #13200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/phalcon/assets/filters/cssminifier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static int phalcon_cssmin_machine(cssmin_parser *parser, unsigned char c TSRMLS_

switch (parser->state) {
case STATE_FREE:
if (c == ' ' && c == '\t' && c == '\n' && c == '\r') {
if (c == ' ' || c == '\t' || c == '\n' || c == '\r') {
c = 0;
} else if (c == '@'){
parser->state = STATE_ATRULE;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Assets/Filters/CssMinTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function testAssetsFilterCssmin()
"The cssmin filter with space as parameter does not return correct results",
function () {
$cssmin = new Cssmin();
expect($cssmin->filter(' '))->equals(' ');
expect($cssmin->filter(' '))->equals('');
}
);

Expand Down