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 "Add CollationFa"
[lhc/web/wiklou.git]
/
includes
/
exception
/
PermissionsError.php
diff --git
a/includes/exception/PermissionsError.php
b/includes/exception/PermissionsError.php
index
bd0b120
..
e31374c
100644
(file)
--- a/
includes/exception/PermissionsError.php
+++ b/
includes/exception/PermissionsError.php
@@
-29,12
+29,19
@@
class PermissionsError extends ErrorPageError {
public $permission, $errors;
/**
public $permission, $errors;
/**
- * @param string $permission A permission name.
- * @param string[] $errors Error message keys
+ * @param string|null $permission A permission name or null if unknown
+ * @param array $errors Error message keys or [key, param...] arrays; must not be empty if
+ * $permission is null
+ * @throws \InvalidArgumentException
*/
public function __construct( $permission, $errors = [] ) {
global $wgLang;
*/
public function __construct( $permission, $errors = [] ) {
global $wgLang;
+ if ( $permission === null && !$errors ) {
+ throw new \InvalidArgumentException( __METHOD__ .
+ ': $permission and $errors cannot both be empty' );
+ }
+
$this->permission = $permission;
if ( !count( $errors ) ) {
$this->permission = $permission;
if ( !count( $errors ) ) {