ox-html: Fix planning info export

* lisp/ox-html.el (org-html-planning): Properly escape angle brackets in
  time-stamps.

Reported-by: Keith Sutton <kesutt@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/105945>

lisp/ox-html.el

@@ -3106,26 +3106,23 @@ contextual information."
   "Transcode a PLANNING element from Org to HTML.
 CONTENTS is nil.  INFO is a plist used as a communication
 channel."
-  (let ((span-fmt "<span class=\"timestamp-kwd\">%s</span> <span class=\"timestamp\">%s</span>"))
+  (format
-    (format
+   "<p><span class=\"timestamp-wrapper\">%s</span></p>"
-     "<p><span class=\"timestamp-wrapper\">%s</span></p>"
+   (org-trim
-     (mapconcat
+    (mapconcat
-      'identity
+     (lambda (pair)
-      (delq nil
+       (let ((timestamp (cdr pair)))
-	    (list
+	 (when timestamp
-	     (let ((closed (org-element-property :closed planning)))
+	   (let ((string (car pair)))
-	       (when closed
+	     (format "<span class=\"timestamp-kwd\">%s</span> \
-		 (format span-fmt org-closed-string
+<span class=\"timestamp\">%s</span> "
-			 (org-timestamp-translate closed))))
+		     string
-	     (let ((deadline (org-element-property :deadline planning)))
+		     (org-html-plain-text (org-timestamp-translate timestamp)
-	       (when deadline
+					  info))))))
-		 (format span-fmt org-deadline-string
+     `((,org-closed-string . ,(org-element-property :closed planning))
-			 (org-timestamp-translate deadline))))
+       (,org-deadline-string . ,(org-element-property :deadline planning))
-	     (let ((scheduled (org-element-property :scheduled planning)))
+       (,org-scheduled-string . ,(org-element-property :scheduled planning)))
-	       (when scheduled
+     ""))))
-		 (format span-fmt org-scheduled-string
-			 (org-timestamp-translate scheduled))))))
-      " "))))
 
 ;;;; Property Drawer