[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c9268f: Adhere to coding style

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c9268f80ad4bea38965af9a47d53538b12a91769
      https://github.com/phpmyadmin/phpmyadmin/commit/c9268f80ad4bea38965af9a47d53538b12a91769
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Adhere to coding style


  Commit: 0c284306596c6f5a50c053e369044a35974c59b0
      https://github.com/phpmyadmin/phpmyadmin/commit/0c284306596c6f5a50c053e369044a35974c59b0
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Wildcards are not applicable to table privileges


  Commit: 17de8a6a49d4ff77edcd2f380bb3de855332222c
      https://github.com/phpmyadmin/phpmyadmin/commit/17de8a6a49d4ff77edcd2f380bb3de855332222c
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Shorten a lines exceeding 85 characters


  Commit: 07444b47088c552efdeb5e6bf38618f178a9ab66
      https://github.com/phpmyadmin/phpmyadmin/commit/07444b47088c552efdeb5e6bf38618f178a9ab66
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Properly identify grant type


  Commit: 7ace92a7860d0609d3f55fba8151c2ef03a8149a
      https://github.com/phpmyadmin/phpmyadmin/commit/7ace92a7860d0609d3f55fba8151c2ef03a8149a
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Grant is considered separately


  Commit: 959ddfa2ea3ccac7ad40af436c443c0d429203f6
      https://github.com/phpmyadmin/phpmyadmin/commit/959ddfa2ea3ccac7ad40af436c443c0d429203f6
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M libraries/config.default.php
    M tbl_relation.php
    M test/classes/dbi/DBIMysql_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_privileges_test.php

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


  Commit: bf389c0730dafe35ba03e6b65bf86ae883d4969e
      https://github.com/phpmyadmin/phpmyadmin/commit/bf389c0730dafe35ba03e6b65bf86ae883d4969e
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Long line


  Commit: df26e950e7251e1530b143a2803f02f26ef281e7
      https://github.com/phpmyadmin/phpmyadmin/commit/df26e950e7251e1530b143a2803f02f26ef281e7
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Handle sub tabs properly


  Commit: 21b3dd1a6f37eac06214adec01814591afe5a9a1
      https://github.com/phpmyadmin/phpmyadmin/commit/21b3dd1a6f37eac06214adec01814591afe5a9a1
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-09-07 (Sat, 07 Sep 2013)

  Changed paths:
    M libraries/config/ConfigFile.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/server_privileges.lib.php
    M po/pt.po
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php

  Log Message:
  -----------
  Merge branch 'master' into UT

Conflicts:
	libraries/server_privileges.lib.php


  Commit: d2107f35d33f5077552543b1245dd4a457437ada
      https://github.com/phpmyadmin/phpmyadmin/commit/d2107f35d33f5077552543b1245dd4a457437ada
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Merge pull request #674 from kasunchathuranga/UT

Bug fixes and improvements related to table specific privilege tab


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d1faa730020...d2107f35d33f