<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Hello Zenk,<div><br></div><div><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">Hello Kristof,<br>oh yes i can reproduce it with all of my browsers. After logging there <br>is indeed this mixed screen.</span></blockquote><div><br></div><div>A reproducible bug is a hundred times better than a random one. :o)</div><br><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">But i?m sorry that i can?t reproduce the diff you provided. I am used to <br>the way a diff is provided like this (this is the way drupal and joomla <br>diffs are provided)<br></span></blockquote><div><br></div><div>Oh, I see where the misunderstanding comes from. We use "git" as source control (even to access an svn repository), while you use "svn", and git's diff puts a little more information in the patches (but leaves nothing out). Also, this diff contains only lines that were added, this is why you don't see the "changed" lines. Please let me explain those bits:</div><br><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">So besides the filename in which the changes have to be made, here i <br>have the functionname, the lines above and below the line that is <br>changed AND the whole row that must be changed. In the way you provide <br>your diff i can not reproduce the patch because:</span></blockquote><div><br></div><div>I'll copy here my original patch too, just to help me:</div><div><br></div><div>-----------------<br><font class="Apple-style-span" face="'Courier New'">diff --git a/index.php b/index.php<br>index ae23b93..3781a08 100644<br>--- a/index.php<br>+++ b/index.php<br>@@ -192,6 +192,11 @@ if(isset($_SESSION["authenticated_user_id"]) && (isset($_SESSION["app_unique_key<br> $use_current_login = true;<br>}<br><br>+// Prevent loading Login again if there is an authenticated user in the session.<br>+if (isset($_SESSION['authenticated_user_id']) && $module == 'Users' && $action == 'Login') {<br>+ header("Location: index.php?action=$default_action&module=$default_module");<br>+}<br>+<br>if($use_current_login)<br>{</font></div><div>-----------------<br></div><br><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">1.(isset($_SESSION["app_unique_key <<< suddenly ends without any closing, what?s the reason for this?</span></blockquote><div><br></div><div>The reason is that this is the line that "patch" uses to locate the place of the diff. Besides the "line number based" identification ("<span class="Apple-style-span" style="font-family: 'Courier New'; ">@@ -192,6 +192,11 @@"<span class="Apple-style-span" style="font-family: Helvetica; ">), my version of diff puts a contextual identification there, too. True, it truncates it. I never noticed this before, since I use "patch -p1 <filename" to apply patches, never apply them manually.</span></span></div><div><br></div><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">2. it says <br>1 files changed, 5 insertions(+), 0 deletions(-)<br><br>WHAT has to be changed and WHERE do i put the 5 lines that have to be added.</span></blockquote><div><br></div><div>It's just a statistic that the "git diff" puts there. :) Feel free to ignore it. :)</div><div>Just as an example, this is how the statistics for a more complex commit look like:</div><div><div><font class="Apple-style-span" face="'Courier New'"><br></font></div><div><font class="Apple-style-span" face="'Courier New'">include/RelatedListView.php | 6 +-----</font></div><div><font class="Apple-style-span" face="'Courier New'">include/utils/ListViewUtils.php | 15 ++++++++++-----</font></div><div><font class="Apple-style-span" face="'Courier New'">include/utils/utils.php | 2 +-</font></div><div><font class="Apple-style-span" face="'Courier New'">modules/Calendar/calendarLayout.php | 3 +--</font></div><div><font class="Apple-style-span" face="'Courier New'">4 files changed, 13 insertions(+), 13 deletions(-)</font></div><div><br></div><div>Here one can see which files has changed, how much text were added, how much removed, how much "chunks" of code changed. When one browses through commits (happens more often with git than with svn, since svn is almost always linear, while git is not), it helps visually distinguish between small a bug commits, big code additions and rewrites, etc...</div></div><div><br></div><blockquote type="cite" class=""><span class="Apple-style-span" style="color: rgb(0, 0, 0); ">Best Regards<br>Torsten Zenk<br></span></blockquote></div><div><br></div><div>Have a nice day!</div><div><br></div><div>Kristóf</div><div><br></div></body></html>