dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Escape return path extra params to php mail()"
[lhc/web/wiklou.git]
/
includes
/
password
/
ParameterizedPassword.php
diff --git
a/includes/password/ParameterizedPassword.php
b/includes/password/ParameterizedPassword.php
index
187f895
..
c929797
100644
(file)
--- a/
includes/password/ParameterizedPassword.php
+++ b/
includes/password/ParameterizedPassword.php
@@
-40,14
+40,14
@@
abstract class ParameterizedPassword extends Password {
* Named parameters that have default values for this password type
* @var array
*/
* Named parameters that have default values for this password type
* @var array
*/
- protected $params =
array()
;
+ protected $params =
[]
;
/**
* Extra arguments that were found in the hash. This may or may not make
* the hash invalid.
* @var array
*/
/**
* Extra arguments that were found in the hash. This may or may not make
* the hash invalid.
* @var array
*/
- protected $args =
array()
;
+ protected $args =
[]
;
protected function parseHash( $hash ) {
parent::parseHash( $hash );
protected function parseHash( $hash ) {
parent::parseHash( $hash );
@@
-90,7
+90,9
@@
abstract class ParameterizedPassword extends Password {
$str .= $this->getDelimiter();
}
$str .= $this->getDelimiter();
}
- return $str . $this->hash;
+ $res = $str . $this->hash;
+ $this->assertIsSafeSize( $res );
+ return $res;
}
/**
}
/**