fix: revert part of changeset: ae7fadcac9e1

I misread. Popcal doesn't support submitting html_kwargs.
self.cgi_escape_attrs is used on a different variable.

Author: rouilj

CHANGES.txt

@@ -125,8 +125,7 @@ Features:
 - Use native number type input for Number() and Integer()
   properties. Integer() uses step=1 as well. (John Rouillard)
 - issue2551231 - template.py-HTMLClass::classhelp doesn't merge
-  user defined classes. It now merges them in. Also fixed same
-  issue in popcal(). (John Rouillard)
+  user defined classes. It now merges them in. (John Rouillard)
 
 2024-07-13 2.4.0
 

roundup/cgi/templating.py

@@ -2454,16 +2454,9 @@ def popcal(self, width=300, height=200, label="(cal)",
             "data-height": height
         }
 
-        if 'class' in html_kwargs:
-            html_classes = ("classhelp %s" %
-                            html_escape(str(html_kwargs["class"]), True))
-            del html_kwargs["class"]
-        else:
-            html_classes = "classhelp"
-
-        return ('<a class="%s" %s href="javascript:help_window('
+        return ('<a class="classhelp" %s href="javascript:help_window('
                 "'%s?@template=calendar&amp;property=%s&amp;form=%s%s', %d, %d)"
-                '">%s</a>' % (html_classes, self.cgi_escape_attrs(**data_attr),
+                '">%s</a>' % (self.cgi_escape_attrs(**data_attr),
                               self._classname, self._name, form, date, width,
                               height, label))