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

// Some fix after merge

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 13:03:43 +00:00
parent a875fecb20
commit 8bfd44085d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/init.php
+1
View File
@@ -28,6 +28,7 @@
ob_start(); ob_start();
$timerStart = microtime(true); $timerStart = microtime(true);
$context = Context::getContext();
if (isset($_GET['logout'])) if (isset($_GET['logout']))
$cookie->logout(); $cookie->logout();
config/config.inc.php
+1 -1
View File
@@ -97,7 +97,7 @@ Configuration::loadConfiguration();
Language::loadLanguages(); Language::loadLanguages();
/* Loading default country */ /* Loading default country */
$defaultCountry = new Country((int)(Configuration::get('PS_COUNTRY_DEFAULT')), Configuration::get('PS_LANG_DEFAULT')); $defaultCountry = new Country(Configuration::get('PS_COUNTRY_DEFAULT'), Configuration::get('PS_LANG_DEFAULT'));
/* Instantiate cookie */ /* Instantiate cookie */
if (defined('PS_ADMIN_DIR')) if (defined('PS_ADMIN_DIR'))
controllers/OrderDetailController.php
+1 -2
View File
@@ -43,7 +43,6 @@ class OrderDetailControllerCore extends FrontController
{ {
parent::preProcess(); parent::preProcess();
if (Tools::isSubmit('submitMessage')) if (Tools::isSubmit('submitMessage'))
{ {
$idOrder = (int)(Tools::getValue('id_order')); $idOrder = (int)(Tools::getValue('id_order'));
@@ -74,7 +73,7 @@ class OrderDetailControllerCore extends FrontController
$to = strval($to->email); $to = strval($to->email);
} }
$toName = strval(Configuration::get('PS_SHOP_NAME')); $toName = strval(Configuration::get('PS_SHOP_NAME'));
$customer = $context->customer->id; $customer = $this->context->customer->id;
if (Validate::isLoadedObject($customer)) if (Validate::isLoadedObject($customer))
Mail::Send($this->context->language->id, 'order_customer_comment', Mail::l('Message from a customer'), Mail::Send($this->context->language->id, 'order_customer_comment', Mail::l('Message from a customer'),
array( array(
controllers/ProductController.php
+1 -1
View File
@@ -209,7 +209,7 @@ class ProductControllerCore extends FrontController
'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2), 'ecotax_tax_exc' => Tools::ps_round($this->product->ecotax, 2),
'ecotaxTax_rate' => $ecotax_rate, 'ecotaxTax_rate' => $ecotax_rate,
'homeSize' => Image::getSize('home'), 'homeSize' => Image::getSize('home'),
'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $context->language->id), 'product_manufacturer' => new Manufacturer((int)$this->product->id_manufacturer, $this->context->language->id),
'token' => Tools::getToken(false), 'token' => Tools::getToken(false),
'productPriceWithoutEcoTax' => (float)$productPriceWithoutEcoTax, 'productPriceWithoutEcoTax' => (float)$productPriceWithoutEcoTax,
'features' => $features, 'features' => $features,