dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : remove deprecated parameter when call Tools::displayDate()

Browse Source
This commit is contained in:
vAugagneur
2013-05-20 16:55:52 +02:00
parent ec87deb016
commit 3328c7a653
15 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminTab.php
+2 -2
View File
@@ -1676,9 +1676,9 @@ abstract class AdminTabCore
elseif (isset($params['float']))
echo rtrim(rtrim($tr[$key], '0'), '.');
elseif (isset($params['type']) && $params['type'] == 'date')
echo Tools::displayDate($tr[$key], $this->context->language->id);
echo Tools::displayDate($tr[$key]);
elseif (isset($params['type']) && $params['type'] == 'datetime')
echo Tools::displayDate($tr[$key], $this->context->language->id, true);
echo Tools::displayDate($tr[$key],null , true);
elseif (isset($tr[$key]))
{
if ($key == 'price')
classes/PaymentModule.php
+1 -1
View File
@@ -595,7 +595,7 @@ abstract class PaymentModuleCore extends Module
'{invoice_phone}' => ($invoice->phone) ? $invoice->phone : $invoice->phone_mobile,
'{invoice_other}' => $invoice->other,
'{order_name}' => $order->getUniqReference(),
'{date}' => Tools::displayDate(date('Y-m-d H:i:s'), (int)$order->id_lang, 1),
'{date}' => Tools::displayDate(date('Y-m-d H:i:s'),null , 1),
'{carrier}' => $virtual_product ? Tools::displayError('No carrier') : $carrier->name,
'{payment}' => Tools::substr($order->payment, 0, 32),
'{products}' => $this->formatProductAndVoucherForEmail($products_list),
classes/Tools.php
+2 -2
View File
@@ -598,7 +598,7 @@ class ToolsCore
*/
public static function dateFormat($params, &$smarty)
{
return Tools::displayDate($params['date'], Context::getContext()->language->id, (isset($params['full']) ? $params['full'] : false));
return Tools::displayDate($params['date'], null, (isset($params['full']) ? $params['full'] : false));
}
/**
@@ -1852,7 +1852,7 @@ exit;
{
$backtrace = debug_backtrace();
$callee = next($backtrace);
$error = 'Parameter <b>'.$parameter.'</b> in function <b>'.$callee['function'].'()</b> is deprecated in <b>'.$callee['file'].'</b> on line <b>'.$callee['Line'].'</b><br />';
$error = 'Parameter <b>'.$parameter.'</b> in function <b>'.(isset($callee['function']) ? $callee['function'] : '').'()</b> is deprecated in <b>'.$callee['file'].'</b> on line <b>'.$callee['Line'].'</b><br />';
$message = 'The parameter '.$parameter.' in function '.$callee['function'].' (Line '.$callee['Line'].') is deprecated and will be removed in the next major version.';
$class = isset($callee['class']) ? $callee['class'] : null;
classes/helper/HelperList.php
+2 -2
View File
@@ -282,9 +282,9 @@ class HelperListCore extends Helper
$this->_list[$index][$key] = Tools::displayPrice($tr[$key], $currency, false);
}
elseif (isset($params['type']) && $params['type'] == 'date')
$this->_list[$index][$key] = Tools::displayDate($tr[$key], $this->context->language->id);
$this->_list[$index][$key] = Tools::displayDate($tr[$key]);
elseif (isset($params['type']) && $params['type'] == 'datetime')
$this->_list[$index][$key] = Tools::displayDate($tr[$key], $this->context->language->id, true);
$this->_list[$index][$key] = Tools::displayDate($tr[$key],null , true);
elseif (isset($tr[$key]))
{
$echo = $tr[$key];
classes/order/OrderHistory.php
+1 -1
View File
@@ -123,7 +123,7 @@ class OrderHistoryCore extends ObjectModel
.'&secure_key='.$order->secure_key;
$assign[$key]['link'] = $dl_link;
if (isset($virtual_product['date_expiration']) && $virtual_product['date_expiration'] != '0000-00-00 00:00:00')
$assign[$key]['deadline'] = Tools::displayDate($virtual_product['date_expiration '], $order->id_lang);
$assign[$key]['deadline'] = Tools::displayDate($virtual_product['date_expiration ']);
if ($product_download->nb_downloadable != 0)
$assign[$key]['downloadable'] = (int)$product_download->nb_downloadable;
}
classes/pdf/HTMLTemplateDeliverySlip.php
+1 -1
View File
@@ -38,7 +38,7 @@ class HTMLTemplateDeliverySlipCore extends HTMLTemplate
$this->smarty = $smarty;
// header informations
$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
$this->date = Tools::displayDate($this->order->invoice_date);
$this->title = HTMLTemplateDeliverySlip::l('Delivery').' #'.Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id).sprintf('%06d', $this->order_invoice->delivery_number);
// footer informations
classes/pdf/HTMLTemplateInvoice.php
+1 -1
View File
@@ -39,7 +39,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$this->smarty = $smarty;
// header informations
$this->date = Tools::displayDate($order_invoice->date_add, (int)$this->order->id_lang);
$this->date = Tools::displayDate($order_invoice->date_add);
$id_lang = Context::getContext()->language->id;
$this->title = HTMLTemplateInvoice::l('Invoice ').' #'.Configuration::get('PS_INVOICE_PREFIX', $id_lang, null, (int)$this->order->id_shop).sprintf('%06d', $order_invoice->number);
classes/pdf/HTMLTemplateOrderReturn.php
+1 -1
View File
@@ -39,7 +39,7 @@ class HTMLTemplateOrderReturnCore extends HTMLTemplate
$this->order = new Order($order_return->id_order);
// header informations
$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
$this->date = Tools::displayDate($this->order->invoice_date);
$this->title = HTMLTemplateOrderReturn::l('Order Return ').sprintf('%06d', $this->order_return->id);
// footer informations