On Fri, Jun 29, 2012 at 10:25 AM, Michal Čihař &lt;<a href="mailto:michal@cihar.com" target="_blank">michal@cihar.com</a>&gt; wrote:<br>&gt; Hi Alex<br>&gt;<br>&gt; here is another bug for you :-)<br>&gt;<br>&gt; <a href="https://sourceforge.net/tracker/?func=detail&amp;aid=3538914&amp;group_id=23067&amp;atid=377408" target="_blank">https://sourceforge.net/tracker/?func=detail&amp;aid=3538914&amp;group_id=23067&amp;atid=377408</a><br>

<br>:) Bring it on!<br><br>I think I fixed it in [1], but I don&#39;t know how to reproduce it (how can<div>I access display_import_ajax.lib.php from the interface?). Also, this</div><div>led me to fixing another bug [2].</div>
<div><br></div><div>
After I merged master and pushed, I can&#39;t seem to be able to make</div><div>a pull request with only these two commits. Is it alright if I also include</div><div>other commits (not mine) in a pull request, or is it easier for you to </div>

<div>merge my branch [3]?</div><div><div><div><div><br></div><div>[1] <a href="https://github.com/alexukf/phpmyadmin/commit/e8ef29f92fb39083c53ed9bee958fd317b699155" target="_blank">https://github.com/alexukf/phpmyadmin/commit/e8ef29f92fb39083c53ed9bee958fd317b699155</a></div>

<div>[2] <a href="https://github.com/alexukf/phpmyadmin/commit/c1b8b9ca867a0bd16f04680877b5ac04185afa1f" target="_blank">https://github.com/alexukf/phpmyadmin/commit/c1b8b9ca867a0bd16f04680877b5ac04185afa1f</a><br>[3] <a href="https://github.com/alexukf/phpmyadmin/tree/plugins-and-OOP" target="_blank">https://github.com/alexukf/phpmyadmin/tree/plugins-and-OOP</a><br>

<br>--<br>Alex</div></div></div></div>