diff --git a/include/class_templateHandling.inc b/include/class_templateHandling.inc index ebc623c277dc464b0853ebcf34fee803d9ab2e44..692f834a1cdd222c6e617c733613e76f50a9e916 100644 --- a/include/class_templateHandling.inc +++ b/include/class_templateHandling.inc @@ -464,9 +464,9 @@ class templateHandling * \param array $args the parameters * \param mixed $str the string or array to apply the modifier on * - * \return array an array of possible values + * \return iterable an array or iterable object of possible values * */ - protected static function applyModifier (string $m, array $args, $str): array + protected static function applyModifier (string $m, array $args, $str) { mb_internal_encoding('UTF-8'); mb_regex_encoding('UTF-8'); diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index 39317d3d75448fa0855fbe5f69c37d76391c3229..a45f134b1be1166269142870c53cde6a124bb0b7 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -383,9 +383,11 @@ class user extends simplePlugin if ($this->uid != '') { $skip[] = 'uid'; } + parent::adapt_from_template($attrs, array_merge($skip, ['userPassword'])); - if (isset($this->attrs['userPassword']) && !in_array('userPassword', $skip)) { - $this->userPassword = $this->attributesAccess['userPassword']->readUserPasswordValues($this->attrs['userPassword'][0], TRUE); + + if (isset($attrs['userPassword']) && !in_array('userPassword', $skip)) { + $this->userPassword = $this->attributesAccess['userPassword']->readUserPasswordValues($attrs['userPassword'][0], TRUE); } }