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 "Clean up $wgSQLiteDataDir handling and removed standalone sqlite class"
[lhc/web/wiklou.git]
/
includes
/
ProtectionForm.php
diff --git
a/includes/ProtectionForm.php
b/includes/ProtectionForm.php
index
4eae1ce
..
1219da5
100644
(file)
--- a/
includes/ProtectionForm.php
+++ b/
includes/ProtectionForm.php
@@
-156,7
+156,7
@@
class ProtectionForm {
} else {
$value = $this->mExpirySelection[$action];
}
} else {
$value = $this->mExpirySelection[$action];
}
- if (
$value == 'infinite' || $value == 'indefinite' || $value == 'infinity'
) {
+ if (
wfIsInfinity( $value )
) {
$time = wfGetDB( DB_SLAVE )->getInfinity();
} else {
$unix = strtotime( $value );
$time = wfGetDB( DB_SLAVE )->getInfinity();
} else {
$unix = strtotime( $value );
@@
-412,11
+412,9
@@
class ProtectionForm {
} else {
list( $show, $value ) = explode( ":", $option );
}
} else {
list( $show, $value ) = explode( ":", $option );
}
- $show = htmlspecialchars( $show );
- $value = htmlspecialchars( $value );
$expiryFormOptions .= Xml::option(
$show,
$expiryFormOptions .= Xml::option(
$show,
-
$value
,
+
htmlspecialchars( $value )
,
$this->mExpirySelection[$action] === $value
) . "\n";
}
$this->mExpirySelection[$action] === $value
) . "\n";
}