[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b48c41: Fix bugs introduced in 788c96e8c744c66619cde6fc887...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b48c414c0bcf2ae93c15ad02e8fb39ec20a39776
      https://github.com/phpmyadmin/phpmyadmin/commit/b48c414c0bcf2ae93c15ad02e8fb39ec20a39776
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/server_privileges.lib.php
    M templates/database/structure/body_for_table_summary.phtml
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Fix bugs introduced in 788c96e8c744c66619cde6fc887b666d581282e6 while fixing issue #11442

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 06e0773d941c8df1bde77120a9d0501305c6be48
      https://github.com/phpmyadmin/phpmyadmin/commit/06e0773d941c8df1bde77120a9d0501305c6be48
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M po/el.po
    M po/nl.po

  Log Message:
  -----------
  Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5


  Commit: 8f0f0c5bbef0fbc6bcf0dfb1d4583ebf5d896002
      https://github.com/phpmyadmin/phpmyadmin/commit/8f0f0c5bbef0fbc6bcf0dfb1d4583ebf5d896002
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/server_privileges.lib.php
    M templates/database/structure/body_for_table_summary.phtml
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3a65539c7f54...8f0f0c5bbef0