Merge branch 'upstream/develop'

2013-11-04 21:44:58 +01:00
parent d79ba9695a c815bd96fb
commit 8fd021bf36
4 changed files with 38 additions and 31 deletions
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2045,6 +2045,7 @@ abstract class CommonObject

    /**
     *  Function to get extra fields of a member into $this->array_options
+     *  This method is in most cases called by method fetch of objects but you can call it separately.
     *
     *  @param	int		$rowid			Id of line
     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()