Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e12582acdb3254df2ee46d9acff3456518c8ac8e https://github.com/phpmyadmin/phpmyadmin/commit/e12582acdb3254df2ee46d9acff3... Author: Nisarg Jhaveri nisargjhaveri@gmail.com Date: 2015-03-16 (Mon, 16 Mar 2015)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- Fix bug#4807

Don't add `.` if table name is not set when trying to get column in sort expression.

Signed-off-by: Nisarg Jhaveri nisargjhaveri@gmail.com

Commit: 6a3be994aa4d671b77b8ac18802c35ee450dc52b https://github.com/phpmyadmin/phpmyadmin/commit/6a3be994aa4d671b77b8ac18802c... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M libraries/DisplayResults.class.php

Log Message: ----------- Merge pull request #1580 from nisargjhaveri/issue_4807

Fix bug#4807

Commit: da656d7f5d51956508257e5f53761732915f85f2 https://github.com/phpmyadmin/phpmyadmin/commit/da656d7f5d51956508257e5f5376... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 08adc35651ad2a3f69e5b6093f4484f11823bdb3 https://github.com/phpmyadmin/phpmyadmin/commit/08adc35651ad2a3f69e5b6093f44... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- Merge branch 'QA_4_3' into QA_4_4

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d7e68f6fac98...08adc35651ad