Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F773086
D497.id1289.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Feb 2, 1:01 AM
Size
4 KB
Mime Type
text/x-diff
Expires
Mon, Feb 3, 1:01 AM (11 h, 57 m)
Engine
blob
Format
Raw Data
Handle
556348
Attached To
D497: INP-1886 - Add value-clearing support for "kDateFormatter::UpdateSubFields" method
D497.id1289.diff
View Options
Index: core/kernel/utility/email_send.php
===================================================================
--- core/kernel/utility/email_send.php
+++ core/kernel/utility/email_send.php
@@ -2142,7 +2142,7 @@
$email_log->Clear();
$email_log->SetDBFieldsFromHash($this->_logData);
- $email_log->UpdateFormattersSubFields();
+ $email_log->UpdateFormattersSubFields(array_keys($this->_logData));
$email_log->Create();
}
Index: core/kernel/utility/formatters/date_formatter.php
===================================================================
--- core/kernel/utility/formatters/date_formatter.php
+++ core/kernel/utility/formatters/date_formatter.php
@@ -174,10 +174,11 @@
*/
public function UpdateSubFields($field, $value, &$options, &$object)
{
+ /** @var array $sub_fields */
$sub_fields = getArrayValue($options, 'sub_fields');
- if ( !$sub_fields || !isset($value) || !$value ) {
- return ;
+ if ( !$sub_fields ) {
+ return;
}
$object->SetDBField($sub_fields['date'], $value);
Index: core/units/logs/session_logs/session_log_eh.php
===================================================================
--- core/units/logs/session_logs/session_log_eh.php
+++ core/units/logs/session_logs/session_log_eh.php
@@ -33,8 +33,11 @@
/** @var kDBItem $object */
$object = $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
+ $now = adodb_mktime();
+
$fields_hash = Array (
- 'SessionStart' => adodb_mktime(),
+ 'SessionStart_date' => $now,
+ 'SessionStart_time' => $now,
'IP' => $this->Application->getClientIp(),
'PortalUserId' => $this->Application->RecallVar('user_id'),
'SessionId' => $this->Application->GetSID(Session::PURPOSE_REFERENCE),
@@ -44,8 +47,6 @@
$object->SetDBFieldsFromHash($fields_hash);
- $object->UpdateFormattersSubFields();
-
if ($object->Create()) {
$this->Application->StoreVar('_SessionLogId_', $object->GetID());
}
@@ -66,14 +67,15 @@
return ;
}
+ $now = adodb_mktime();
$fields_hash = Array (
- 'SessionEnd' => adodb_mktime(),
+ 'SessionEnd_date' => $now,
+ 'SessionEnd_time' => $now,
'Status' => SESSION_LOG_LOGGED_OUT,
);
$object->SetDBFieldsFromHash($fields_hash);
- $object->UpdateFormattersSubFields();
$object->Update();
}
Index: modules/in-commerce/units/gateways/gw_classes/paypal.php
===================================================================
--- modules/in-commerce/units/gateways/gw_classes/paypal.php
+++ modules/in-commerce/units/gateways/gw_classes/paypal.php
@@ -207,8 +207,10 @@
$order->SetDBFieldsFromHash($org_order->GetFieldValues());
$order->SetDBField('SubTotal', $field_values['Price']);
$order->SetDBField('OriginalAmout', $field_values['Price']);
- $order->SetDBField('OrderDate', adodb_mktime());
- $order->UpdateFormattersSubFields();
+
+ $now = adodb_mktime();
+ $order->SetDBField('OrderDate_date', $now);
+ $order->SetDBField('OrderDate_time', $now);
$dup_item = false;
if ($org_order->GetDBField('Status') >= ORDER_STATUS_PROCESSED) {
Index: modules/in-commerce/units/orders/orders_event_handler.php
===================================================================
--- modules/in-commerce/units/orders/orders_event_handler.php
+++ modules/in-commerce/units/orders/orders_event_handler.php
@@ -1663,7 +1663,7 @@
}
$object->SetDBField('OrderIP', $this->Application->getClientIp());
- $object->UpdateFormattersSubFields();
+ $object->UpdateFormattersSubFields($reset_fields);
}
function OnReserveItems($event)
@@ -2214,8 +2214,9 @@
$set_new_status = $this->approveOrder($order_items);
// $set_new_status = $this->shipOrder($order_items);
- $object->SetDBField('ShippingDate', adodb_mktime());
- $object->UpdateFormattersSubFields();
+ $now = adodb_mktime();
+ $object->SetDBField('ShippingDate_date', $now);
+ $object->SetDBField('ShippingDate_time', $now);
$shipping_email = $object->GetDBField('ShippingEmail');
$email_params['to_email'] = $shipping_email ? $shipping_email : $email_params['_user_email'];
Event Timeline
Log In to Comment