What actually changed? The diff shows the full file changing, which might
mean the line endings in the file have all been replaced.

On Fri, Apr 25, 2014 at 9:56 AM, masters1333 notifications@github.comwrote:

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=33653&start=0

You can merge this Pull Request by running

git pull https://github.com/masters1333/joomla-cms staging

Or view, comment on, or merge it at:

#3504
Commit Summary

• Fix for tracker item #33653

File Changes

• M components/com_content/models/articles.phphttps://github.com/joomla/joomla-cms/pull/3504/files#diff-0(1360)

Patch Links:

• https://github.com/joomla/joomla-cms/pull/3504.patch
• https://github.com/joomla/joomla-cms/pull/3504.diff

—
Reply to this email directly or view it on GitHub#3504
.

Sorry about that, this is the first time I've done this. I'm not sure what I did wrong. The only change is line 147... added serialize.

$id .= ':' . serialize($this->getState('filter.article_id'));

Make sure you saved the file as utf8 with linux line endings (not Windows ones).

Sorry for all of the tests I'm not quite sure what I'm doing here yet. I fixed the line endings problem on my end. See The final commit at the bottom [#33653] Commit with corrected diff

Although the PR looks weird indeed (it also includes the full whosonline module), I tested it and it just changes the line concerned. No EOL issue. Marking 1 good test.

Please add another commit to your branch with correct line endings. This will automatically update this PR. This cannot be merged this way, nor security-reviewed. from me as is.

@beat I thought I did that here: masters1333@29d538f

I'm sorry but at this point I'm not sure how to fix my branch the way you want. I added a setting in Eclipse > Team > Git > Configuration "core.autocrlf" to false. This seemed to fix the problem. I ran some tests on the whosonline module trying to get the line endings correct not knowing it would end up here. Now I don't know how to go back and edit the original commit.

I cannot reproduce this issue on the current staging branch. The notice never shows up, this is on PHP 5.5.12.

@masters1333 If you can't fix this PR, please create a new one.
This PR also contains a changed file in the whosonline module. Seems to be also some formatting issue (line ending or encoding or whatever).
The change itself makes sense to me.

OK I will add a new PR