Merge "Avoid double escaped expiry time on action=protect"

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 4eae1ce..f777a37 100644 (file)
--- 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";
                        }