[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7f38ab: Refactoring lost during merge

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7f38ab21d3d0fb9673eaaaab50d808e702818aef
      https://github.com/phpmyadmin/phpmyadmin/commit/7f38ab21d3d0fb9673eaaaab50d808e702818aef
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
    M tbl_replace.php

  Log Message:
  -----------
  Refactoring lost during merge


  Commit: 7a32ea9def5a85d0c869b8eed1fe23b22c5de316
      https://github.com/phpmyadmin/phpmyadmin/commit/7a32ea9def5a85d0c869b8eed1fe23b22c5de316
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
    M tbl_replace.php

  Log Message:
  -----------
  Possibility of undefined variable here


  Commit: b2ffb574a640264f4e60dd5d375513a52fb6d283
      https://github.com/phpmyadmin/phpmyadmin/commit/b2ffb574a640264f4e60dd5d375513a52fb6d283
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_replace.php

  Log Message:
  -----------
  Incorrect function signature


  Commit: feb773213393dee65d94179c81456f58f7f2af53
      https://github.com/phpmyadmin/phpmyadmin/commit/feb773213393dee65d94179c81456f58f7f2af53
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-23 (Sun, 23 Sep 2012)

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_replace.php

  Log Message:
  -----------
  Make transformations work using the new plugins system, when grid editing


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7fa908e45509...feb773213393