From: umherirrender Date: Tue, 27 Jan 2015 19:44:34 +0000 (+0100) Subject: Avoid double escaped expiry time on action=protect X-Git-Tag: 1.31.0-rc.0~12557^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=b532948417ca768feb7b3ac3503548af46e66fd5;p=lhc%2Fweb%2Fwiklou.git Avoid double escaped expiry time on action=protect Xml::option passed the first param to Html::element which escaped the value, so no htmlspecialchars is needed for $show. The htmlspecialchar moved closer to output, because the comparision does not need it Bug: T85864 Change-Id: Ib8b948563095143de686756ceaf46c48cab2c5e0 --- diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php index 4eae1ce428..f777a37df4 100644 --- a/includes/ProtectionForm.php +++ b/includes/ProtectionForm.php @@ -412,11 +412,9 @@ class ProtectionForm { } else { list( $show, $value ) = explode( ":", $option ); } - $show = htmlspecialchars( $show ); - $value = htmlspecialchars( $value ); $expiryFormOptions .= Xml::option( $show, - $value, + htmlspecialchars( $value ), $this->mExpirySelection[$action] === $value ) . "\n"; }