[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2c5541: Fix #12399: Adding index to table shows wrong top ...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2c5541a94b12fea64ffbe67a504dddb1725cbaf0
      https://github.com/phpmyadmin/phpmyadmin/commit/2c5541a94b12fea64ffbe67a504dddb1725cbaf0
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M import.php
    M libraries/sql.lib.php
    M sql.php

  Log Message:
  -----------
  Fix #12399: Adding index to table shows wrong top navigation

If the SQL query analyzing sets the $table value to '',
don't update the original value

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee
      https://github.com/phpmyadmin/phpmyadmin/commit/2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entries for #12425 and #12399

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: aecf9de8faacf2c0b02aa14f3b5558c2fa086b10
      https://github.com/phpmyadmin/phpmyadmin/commit/aecf9de8faacf2c0b02aa14f3b5558c2fa086b10
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files

[CI skip]

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


  Commit: 3bcd45f87f64330f890e5cd5e22c39cdcd419ea6
      https://github.com/phpmyadmin/phpmyadmin/commit/3bcd45f87f64330f890e5cd5e22c39cdcd419ea6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M ChangeLog
    M import.php
    M libraries/sql.lib.php
    M sql.php

  Log Message:
  -----------
  Merge commit '2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee'


  Commit: 39cb4d045c136c9449191aca8dc212e4412ccba2
      https://github.com/phpmyadmin/phpmyadmin/commit/39cb4d045c136c9449191aca8dc212e4412ccba2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Log Message:
  -----------
  Merge branch 'QA_4_6'


  Commit: b22288bd6afaa84199264908c900b41be47fcbc2
      https://github.com/phpmyadmin/phpmyadmin/commit/b22288bd6afaa84199264908c900b41be47fcbc2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fil.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files

[CI skip]

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/257a74e116d4...b22288bd6afa