lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

last ones

Browse Source
This commit is contained in:
florian HENRY 2018-03-21 23:03:22 +01:00
parent 487ef3b7c9
commit 4ebb138533
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/user/class/user.class.php
View File

@ -115,7 +115,7 @@ class User extends CommonObject
public $lastsearch_values_tmp; // To store current search criterias for user public $lastsearch_values_tmp; // To store current search criterias for user
public $lastsearch_values; // To store last saved search criterias for user public $lastsearch_values; // To store last saved search criterias for user
public $users = array(); // To store all tree of users hierarchy public $users = array(); // To store all tree of users hierarchy
public $parentof; // To store an array of all parents for all ids. public $parentof; // To store an array of all parents for all ids.
private $cache_childids; private $cache_childids;
@ -3012,11 +3012,11 @@ class User extends CommonObject
} }
/** /**
* Return property of contact from its id * Return property of user from its id
* *
* @param int $rowid id of contact * @param int $rowid id of contact
* @param string $mode 'email' or 'mobile' * @param string $mode 'email' or 'mobile'
* @return string Email of contact with format: "Full name <email>" * @return string Email of user with format: "Full name <email>"
*/ */
function user_get_property($rowid,$mode) function user_get_property($rowid,$mode)
{ {
@ -3049,7 +3049,7 @@ class User extends CommonObject
} }
/** /**
* Load all objects into $this->lines * Load all objects into $this->users
* *
* @param string $sortorder sort order * @param string $sortorder sort order
* @param string $sortfield sort field * @param string $sortfield sort field
@ -3062,7 +3062,6 @@ class User extends CommonObject
{ {
global $conf; global $conf;
$sql="SELECT t.rowid"; $sql="SELECT t.rowid";
$sql.= ' FROM '.MAIN_DB_PREFIX .$this->table_element.' as t '; $sql.= ' FROM '.MAIN_DB_PREFIX .$this->table_element.' as t ';
$sql.= " WHERE 1"; $sql.= " WHERE 1";