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

// You shall not DIE!

Browse Source
This commit is contained in:
dMetzger
2012-02-20 09:14:01 +00:00
parent ef69ac9925
commit 1c4162ff2e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+1 -1
View File
@@ -159,7 +159,7 @@ class FrontControllerCore extends Controller
/* Theme is missing or maintenance */ /* Theme is missing or maintenance */
if (!is_dir(_PS_THEME_DIR_)) if (!is_dir(_PS_THEME_DIR_))
die(Tools::displayError('Current theme unavailable. Please check your theme directory name and permissions.')); die(sprintf(Tools::displayError('Current theme unavailable "%s". Please check your theme directory name and permissions.'), basename(rtrim(_PS_THEME_DIR_, '/\\'))));
elseif (basename($_SERVER['PHP_SELF']) != 'disabled.php' && !(int)(Configuration::get('PS_SHOP_ENABLE'))) elseif (basename($_SERVER['PHP_SELF']) != 'disabled.php' && !(int)(Configuration::get('PS_SHOP_ENABLE')))
$this->maintenance = true; $this->maintenance = true;
elseif (Configuration::get('PS_GEOLOCATION_ENABLED')) elseif (Configuration::get('PS_GEOLOCATION_ENABLED'))
classes/order/Order.php
+1 -1
View File
@@ -1120,7 +1120,7 @@ class OrderCore extends ObjectModel
$order = new Order($id_order); $order = new Order($id_order);
$orderState = $order->getCurrentOrderState(); $orderState = $order->getCurrentOrderState();
if (!Validate::isLoadedObject($orderState) || !Validate::isLoadedObject($order)) if (!Validate::isLoadedObject($orderState) || !Validate::isLoadedObject($order))
throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order)); return '';
echo '<span style="width:20px; margin-right:5px;">'; echo '<span style="width:20px; margin-right:5px;">';
if (($orderState->invoice && $order->invoice_number) && (int)($tr['product_number'])) if (($orderState->invoice && $order->invoice_number) && (int)($tr['product_number']))
echo '<a target="_blank" href="pdf.php?id_order='.(int)$order->id.'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>'; echo '<a target="_blank" href="pdf.php?id_order='.(int)$order->id.'&pdf"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>';
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -165,7 +165,7 @@ class AdminOrdersControllerCore extends AdminController
$order = new Order($id_order); $order = new Order($id_order);
$order_state = $order->getCurrentOrderState(); $order_state = $order->getCurrentOrderState();
if (!Validate::isLoadedObject($order_state) || !Validate::isLoadedObject($order)) if (!Validate::isLoadedObject($order_state) || !Validate::isLoadedObject($order))
throw new PrestaShopException(sprintf('unable to load order id %s and/or its state', $id_order)); return '';
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'order' => $order, 'order' => $order,