Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 85747b9ae99bd6110578c7f467ee99ad91324b7a
      
https://github.com/phpmyadmin/phpmyadmin/commit/85747b9ae99bd6110578c7f467ee99ad91324b7a
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M ChangeLog
    M libraries/DatabaseInterface.php
    M libraries/ListDatabase.php
    M libraries/controllers/table/TableRelationController.php
    M templates/table/relation/foreign_key_row.phtml

  Log Message:
  -----------
  Use usort() instead of natsort()

The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.

Fixes #13465

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 5f21c8dbc64ffab4f8b08affcc946ca06460bdbb
      
https://github.com/phpmyadmin/phpmyadmin/commit/5f21c8dbc64ffab4f8b08affcc946ca06460bdbb
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M ChangeLog
    M libraries/classes/DatabaseInterface.php
    M libraries/classes/ListDatabase.php
    M libraries/controllers/table/TableRelationController.php
    M templates/table/relation/foreign_key_row.phtml

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/7f7af4c646e4...5f21c8dbc64f
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to