Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2f1dc89d0a3b426ca4e6c2721b3a20669db8bab7
      
https://github.com/phpmyadmin/phpmyadmin/commit/2f1dc89d0a3b426ca4e6c2721b3a20669db8bab7
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M libraries/Advisor.class.php

  Log Message:
  -----------
  Simplify translation evaluation

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 28f0a09b2f1a6a9c24b93d5c31d9342fda10eb71
      
https://github.com/phpmyadmin/phpmyadmin/commit/28f0a09b2f1a6a9c24b93d5c31d9342fda10eb71
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M test/classes/PMA_Advisor_test.php

  Log Message:
  -----------
  Fix order of params to assertEquals

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: ffbb41d6d5ab37da4c81c4d78c3671b4519992d1
      
https://github.com/phpmyadmin/phpmyadmin/commit/ffbb41d6d5ab37da4c81c4d78c3671b4519992d1
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M test/classes/PMA_Advisor_test.php

  Log Message:
  -----------
  Fix expected message to match code

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: eb85831fe12703cc078b8b24a700958bd4495672
      
https://github.com/phpmyadmin/phpmyadmin/commit/eb85831fe12703cc078b8b24a700958bd4495672
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M libraries/Advisor.class.php

  Log Message:
  -----------
  Fixed ob_start/eval problems in phpunit

When running in phpunit, the eval can raise exception, so treat it same
as it would be output returned by the eval. Without catching it, output
buffering gets one more level of nesting leading to occassional
timeouts in Travis-CI.

Signed-off-by: Michal Čihař <mic...@cihar.com>


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d33d3a1fb373...eb85831fe127
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to