[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2f1c99: Fix #12099 Undefined index: controllink

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2f1c9964094002a3eec665c4c2eb4cec8e1a9fee
      https://github.com/phpmyadmin/phpmyadmin/commit/2f1c9964094002a3eec665c4c2eb4cec8e1a9fee
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Fix #12099 Undefined index: controllink

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 46dee5d1eb6d39e02c2b762c442f36f2e8c987e2
      https://github.com/phpmyadmin/phpmyadmin/commit/46dee5d1eb6d39e02c2b762c442f36f2e8c987e2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c6d2f0012cd3...46dee5d1eb6d