filter dialog: display parsed date when checking; fix Check it button not using Dijit control

2 files changed, 4 insertions, 2 deletions

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 4f2ba252f..0630d8821 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -456,7 +456,8 @@
 			$date = db_escape_string($_REQUEST["date"]);
 			$date_parsed = strtotime($date);
 
-			print json_encode(array("result" => (bool)$date_parsed));
+			print json_encode(array("result" => (bool)$date_parsed,
+				"date" => date("c", $date_parsed)));
 			return;
 		}
 
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 78962dc6c..02459ba84 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -466,7 +466,8 @@
 				 name=\"reg_exp\" value=\"$reg_exp\"/>";
 
 			print "<span id=\"filterDlg_dateChkBox\" style=\"display : none\">";
-			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+				onclick=\"return filterDlgCheckDate()\">".
 				__('Check it')."</button>";
 			print "</span>";