Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -r415 -r484
--- trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 415)
+++ trunk/kernel/include/portaluser.php (.../portaluser.php) (revision 484)
@@ -629,8 +629,8 @@
case "user_date":
return LangDate($this->Get("CreatedOn"));
break;
- case "user_datetime":
- return LangDate($this->Get("CreatedOn"))." ".LangTime($this->Get("CreatedOn"));
+ case "user_time":
+ return LangTime($this->Get("CreatedOn"));
break;
case "user_dob":
return LangDate($this->Get("dob"));
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -r402 -r484
--- trunk/admin/users/adduser.php (.../adduser.php) (revision 402)
+++ trunk/admin/users/adduser.php (.../adduser.php) (revision 484)
@@ -296,13 +296,23 @@
|
- >
+
+
>
|
- ">
+ ">
|
|
+ >
+ |
+
+ ">
+ |
+ |
+
+
+
GetFieldUIList(TRUE);
Index: trunk/kernel/include/dates.php
===================================================================
diff -u -r361 -r484
--- trunk/kernel/include/dates.php (.../dates.php) (revision 361)
+++ trunk/kernel/include/dates.php (.../dates.php) (revision 484)
@@ -100,7 +100,7 @@
return $ticks;
}
-function DateCurrTimeTimstamp($data, $SourceFormat)
+function DateCurrTimeTimstamp($date, $SourceFormat)
{
if(strlen($date))
{
Index: trunk/kernel/action.php
===================================================================
diff -u -r480 -r484
--- trunk/kernel/action.php (.../action.php) (revision 480)
+++ trunk/kernel/action.php (.../action.php) (revision 484)
@@ -85,7 +85,9 @@
$dupe_user = '';
//$user_pending = (int)$_POST["user_pending"];
//$user_enabled = (int)$_POST["user_enabled"];
- $CreatedOn = time();//DateCurrTimeTimstamp($_POST["user_date"],GetDateFormat());
+ $CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
+ $CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
+
$dob = DateTimestamp($_POST["user_dob"],GetDateFormat());
$objEditItems = new clsUserManager();
@@ -138,6 +140,7 @@
case "m_edit_user":
//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
+ //$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
$dob = DateTimestamp($_POST["user_dob"],GetDateFormat());
$objEditItems = new clsUserManager();
$objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");