[phpmyadmin/phpmyadmin] 1c77a4: Fix #12281 Copying a user resets SSL to None - Git

6 Jun 2016


      Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1c77a4ef0dbd7af493018b942f8bd46e38871c93
      https://github.com/phpmyadmin/phpmyadmin/commit/1c77a4ef0dbd7af493018b942f8b...
  Author: Madhura Jayaratne madhura.cj@gmail.com
  Date:   2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  Fix #12281 Copying a user resets SSL to None
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c4e7447a965ca50f53a947df7f24f72e86154b53
      https://github.com/phpmyadmin/phpmyadmin/commit/c4e7447a965ca50f53a947df7f24...
  Author: Madhura Jayaratne madhura.cj@gmail.com
  Date:   2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
    M ChangeLog
    M js/pmd/move.js
    M libraries/Error.php
    M libraries/dbi/DBIMysqli.php
    M po/pt_BR.po
    M test/classes/ErrorTest.php
Log Message:
  -----------
  Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281
Conflicts:
    ChangeLog
Commit: c2322a637dc1e01322817618f9c5a529e184ce7f
      https://github.com/phpmyadmin/phpmyadmin/commit/c2322a637dc1e01322817618f9c5...
  Author: Madhura Jayaratne madhura.cj@gmail.com
  Date:   2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  Merge pull request #12296 from madhuracj/bug12281
Fix #12281 Copying a user resets SSL to None
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4fd270965082...c2322a637dc1