[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 28074d: Code style fixes

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 28074d27f4eeebf3cb315b90c274b157b10cded4
      https://github.com/phpmyadmin/phpmyadmin/commit/28074d27f4eeebf3cb315b90c274b157b10cded4
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Code style fixes

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: d666ed61af1d5bbb20e65f49d0eedc0576d0ad43
      https://github.com/phpmyadmin/phpmyadmin/commit/d666ed61af1d5bbb20e65f49d0eedc0576d0ad43
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M libraries/mysql_charsets.lib.php

  Log Message:
  -----------
  Comment that missing break statement is intended

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: daaf70bca2f017c406835250e39976db65370129
      https://github.com/phpmyadmin/phpmyadmin/commit/daaf70bca2f017c406835250e39976db65370129
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M libraries/properties/options/OptionsPropertyOneItem.class.php

  Log Message:
  -----------
  Rename OptionsPropertyOneItem::$_force overwritten from parent

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 524e82e33c66a984e0cb52f9730b339e4d275636
      https://github.com/phpmyadmin/phpmyadmin/commit/524e82e33c66a984e0cb52f9730b339e4d275636
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M libraries/server_status_variables.lib.php

  Log Message:
  -----------
  Extrace query cache total blocks value correctly

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 5facff36bd4e4215072aac4abbd163f0159120d5
      https://github.com/phpmyadmin/phpmyadmin/commit/5facff36bd4e4215072aac4abbd163f0159120d5
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  Add missing break in # comment detection switch

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: ec29a0c59d85d192c0fea9b3f13c65b0bbb15a8c
      https://github.com/phpmyadmin/phpmyadmin/commit/ec29a0c59d85d192c0fea9b3f13c65b0bbb15a8c
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Add missing )

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 20b2a3a707ff061fb1cf43154ad684aa6c080bdd
      https://github.com/phpmyadmin/phpmyadmin/commit/20b2a3a707ff061fb1cf43154ad684aa6c080bdd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Merge commit '28074d2'


  Commit: 7630006be282a077cdd8089ad9e9d1f2a134f869
      https://github.com/phpmyadmin/phpmyadmin/commit/7630006be282a077cdd8089ad9e9d1f2a134f869
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M libraries/mysql_charsets.lib.php

  Log Message:
  -----------
  Merge commit 'd666ed6'


  Commit: e50b0d2b719669222a99309611086c4238bace69
      https://github.com/phpmyadmin/phpmyadmin/commit/e50b0d2b719669222a99309611086c4238bace69
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M libraries/properties/options/OptionsPropertyOneItem.class.php

  Log Message:
  -----------
  Merge commit 'daaf70b'


  Commit: decbcdfeee8b490f5bf9d1a1e03392c88991885c
      https://github.com/phpmyadmin/phpmyadmin/commit/decbcdfeee8b490f5bf9d1a1e03392c88991885c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M libraries/server_status_variables.lib.php

  Log Message:
  -----------
  Merge commit '524e82e'


  Commit: ad1e2352cac1200923a6f5b50d981eb746673e0a
      https://github.com/phpmyadmin/phpmyadmin/commit/ad1e2352cac1200923a6f5b50d981eb746673e0a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 1a32869ba15c459c634dc92e6b14fbf569bac2aa
      https://github.com/phpmyadmin/phpmyadmin/commit/1a32869ba15c459c634dc92e6b14fbf569bac2aa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-23 (Fri, 23 May 2014)

  Changed paths:
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Merge commit 'ec29a0c'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9373e1b2041a...1a32869ba15c