[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 698289: #4144 "DROP DATABASE" displays wrong database name...

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6982892ef9be85b893a3fca73f218ed2c3f6924f
      https://github.com/phpmyadmin/phpmyadmin/commit/6982892ef9be85b893a3fca73f218ed2c3f6924f
  Author: Umair Khan <omerjerk at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M db_operations.php
    M js/db_operations.js

  Log Message:
  -----------
  #4144 "DROP DATABASE" displays wrong database name FIX


  Commit: fb29c0016130a74f12941da311c1f54a6922146c
      https://github.com/phpmyadmin/phpmyadmin/commit/fb29c0016130a74f12941da311c1f54a6922146c
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M db_operations.php
    M js/db_operations.js

  Log Message:
  -----------
  Merge pull request #732 from omerjerk/QA_4_0

#4144 "DROP DATABASE" displays wrong database name FIX


  Commit: eff2e31c104fb322152c44dc15bfbc14017d9646
      https://github.com/phpmyadmin/phpmyadmin/commit/eff2e31c104fb322152c44dc15bfbc14017d9646
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M db_operations.php
    M js/db_operations.js

  Log Message:
  -----------
  Merge branch 'QA_4_0'

Conflicts:
	js/db_operations.js


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8fc926dd64a7...eff2e31c104f