[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 58a6d5: Rewrite URL constructing during import

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 58a6d50f6a26b1ff5959b2209c3315933ef6a41b
      https://github.com/phpmyadmin/phpmyadmin/commit/58a6d50f6a26b1ff5959b2209c3315933ef6a41b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Rewrite URL constructing during import

- Share most of the code
- Correctly generate URL in corner cases

Fixes #13189

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: c97210c9e41ef661b199a6e9efa405d6f7c7259f
      https://github.com/phpmyadmin/phpmyadmin/commit/c97210c9e41ef661b199a6e9efa405d6f7c7259f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Merge pull request #13364 from nijel/import-timeout-url

Rewrite URL constructing during import


  Commit: 1e1bc20f7cf53784de693c7ca6fb396c91ac2eba
      https://github.com/phpmyadmin/phpmyadmin/commit/1e1bc20f7cf53784de693c7ca6fb396c91ac2eba
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Document change for #13189 and #13364.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: d540e3a2844d63077ea26aeafd5a94f02783633a
      https://github.com/phpmyadmin/phpmyadmin/commit/d540e3a2844d63077ea26aeafd5a94f02783633a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M ChangeLog
    M import.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63e0b5f8f97f...d540e3a2844d