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

Coding style #870

Merged
merged 7 commits into from
Feb 28, 2017
Merged

Coding style #870

merged 7 commits into from
Feb 28, 2017

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Feb 6, 2017

This will be merged once all other pending PRs are merged.

Edit: Coincidentally, it also fixes PHP 7.2 compatibility.

@jtojnar jtojnar self-assigned this Feb 6, 2017
} else {
if($itemDao->hasMore())
$itemsHtml .= '<div class="stream-more"><span>'. \F3::get('lang_more').'</span></div>';
$itemsHtml .= '<div class="mark-these-read"><span>'. \F3::get('lang_markread').'</span></div>';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Judging by the indentation, this was meant to be part of the if. Am I right, @niol?

Original commit: 3c1dc19

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No indention is wrong here: the button should be shown even if there are no more items to show, because it is intended to mark visible items as read.

Note: this code is removed by #846.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, never mind then.

@jtojnar jtojnar force-pushed the cs branch 2 times, most recently from 732a1b6 to bfeb5d7 Compare February 12, 2017 11:49
@jtojnar jtojnar force-pushed the cs branch 3 times, most recently from 6ed01c5 to 730b095 Compare February 27, 2017 22:46
@jtojnar jtojnar force-pushed the cs branch 2 times, most recently from 416751e to b8f228e Compare February 28, 2017 00:46
@jtojnar jtojnar merged commit 1105a4f into master Feb 28, 2017
@jtojnar jtojnar deleted the cs branch February 28, 2017 10:24
@jtojnar jtojnar mentioned this pull request Oct 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants