[Dolibarr-git] [Dolibarr/dolibarr] 921a37: Fix: security

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 921a3797403432ce33da9c4ed9130bb3c0b0445a
      
https://github.com/Dolibarr/dolibarr/commit/921a3797403432ce33da9c4ed9130bb3c0b0445a
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M htdocs/admin/boxes.php
  M htdocs/admin/ihm.php
  M htdocs/core/lib/usergroups.lib.php
  M htdocs/main.inc.php
  M htdocs/user/index.php
  M htdocs/user/info.php
  M htdocs/user/note.php
  M htdocs/user/param_ihm.php

  Log Message:
  -----------
  Fix: security


  Commit: 0c8e4b8f1badd16fb5816222dfab6c311252c960
      
https://github.com/Dolibarr/dolibarr/commit/0c8e4b8f1badd16fb5816222dfab6c311252c960
  Author: Regis Houssin <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M dev/skeletons/modMyModule.class.php
  M htdocs/admin/menus.php
  M htdocs/admin/modules.php
  M htdocs/core/db/mssql.class.php
  M htdocs/core/db/mysql.class.php
  M htdocs/core/db/mysqli.class.php
  M htdocs/core/db/pgsql.class.php
  M htdocs/core/lib/functions.lib.php
  M htdocs/core/lib/usergroups.lib.php
  M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
  M htdocs/user/class/user.class.php
  M htdocs/user/fiche.php
  M htdocs/user/index.php
  M htdocs/user/info.php
  M htdocs/user/note.php
  M htdocs/user/param_ihm.php
  M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch 'develop' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into develop

Conflicts:
        htdocs/user/index.php
        htdocs/user/info.php
        htdocs/user/note.php
        htdocs/user/param_ihm.php


Compare: https://github.com/Dolibarr/dolibarr/compare/7f4944d...0c8e4b8