[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 376e80: fix the UT error

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 376e8027eab07bab6fdb9ec073eabae48d1cfacb
      https://github.com/phpmyadmin/phpmyadmin/commit/376e8027eab07bab6fdb9ec073eabae48d1cfacb
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M libraries/Advisor.class.php

  Log Message:
  -----------
  fix the UT error


  Commit: a88c2588645fd9e1ffdea59539cca6f88934ebb2
      https://github.com/phpmyadmin/phpmyadmin/commit/a88c2588645fd9e1ffdea59539cca6f88934ebb2
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ChangeLog
    M config.sample.inc.php
    M doc/config.rst
    M examples/config.manyhosts.inc.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M js/server_privileges.js
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/relation.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_status.lib.php
    M libraries/sql.lib.php
    M po/he.po
    M po/pt_BR.po
    M server_privileges.php
    M server_status.php
    A server_user_groups.php
    M sql.php
    M test/bootstrap-dist.php
    A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_user_preferences_test.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into serverview_refactor


  Commit: f52a89c2736b184a21a6e77431361b47927e6da9
      https://github.com/phpmyadmin/phpmyadmin/commit/f52a89c2736b184a21a6e77431361b47927e6da9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M libraries/Advisor.class.php

  Log Message:
  -----------
  Merge pull request #515 from xmujay/serverview_refactor

fix the regression error


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b5b3537b7463...f52a89c2736b