1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 12:21:45 +02:00

PM Notification datestamp fix.

This commit is contained in:
Cameron
2016-04-23 14:13:31 -07:00
parent 0bb010649c
commit a21d351cd2
2 changed files with 24 additions and 10 deletions

View File

@@ -1180,7 +1180,7 @@ class e_form
/**
* User auto-complete search
*
* XXX EXPERIMENTAL - subject to change.
* @param string $name_fld field name for user name
* @param string $id_fld field name for user id
* @param string $default_name default user name value
@@ -4667,7 +4667,7 @@ class e_form
if(!isset($parms['__options'])) $parms['__options'] = array();
if(!is_array($parms['__options'])) parse_str($parms['__options'], $parms['__options']);
if((empty($value) && varset($parms['currentInit'],USERID)!=0) || vartrue($parms['current'])) // include current user by default.
if((empty($value) && varset($parms['currentInit'],USERID)!=0 && varset($parms['default']) !=0) || vartrue($parms['current'])) // include current user by default.
{
$value = USERID;
if(vartrue($parms['current']))
@@ -4687,6 +4687,14 @@ class e_form
if(!$value) $value = array();
$uname = varset($value[$colname]);
$value = varset($value['user_id'], 0);
if(!empty($parms['max']))
{
$parms['__options']['selectize']['maxItems'] = intval($parms['max']);
}
$ret = $this->userpicker(vartrue($parms['nameField'], $key), $key, $uname, $value, vartrue($parms['__options']));
break;