[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 35becb: Fix duplicate function call

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 35becb00ee77438873d82f32e7a225ccf138696e
      https://github.com/phpmyadmin/phpmyadmin/commit/35becb00ee77438873d82f32e7a225ccf138696e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M templates/database/structure/sortable_header.phtml

  Log Message:
  -----------
  Fix duplicate function call

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


  Commit: 8eee22be3ae7c1696aaa136efa5e5875d7b0b92b
      https://github.com/phpmyadmin/phpmyadmin/commit/8eee22be3ae7c1696aaa136efa5e5875d7b0b92b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M build.xml

  Log Message:
  -----------
  Lint templates as well

This will help us spotting syntax errors even in files which are not
covered by tests.

Fixes #12055

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


  Commit: faa1229ed7ee43ef19b0d0ac0c48ad0c81305e9f
      https://github.com/phpmyadmin/phpmyadmin/commit/faa1229ed7ee43ef19b0d0ac0c48ad0c81305e9f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M build.xml

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85972d35293e...faa1229ed7ee