From 5b908a08445885545ef8f47afdb9294c8c10a00d Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Mon, 21 Nov 2011 10:11:49 +0000 Subject: [PATCH] // fix tpl folder detection in BO git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd --- .../{addons_myaccount => addons_my_account}/content.tpl | 0 classes/Tools.php | 2 +- controllers/admin/AdminOrdersController.php | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename admin-dev/themes/template/{addons_myaccount => addons_my_account}/content.tpl (100%) diff --git a/admin-dev/themes/template/addons_myaccount/content.tpl b/admin-dev/themes/template/addons_my_account/content.tpl similarity index 100% rename from admin-dev/themes/template/addons_myaccount/content.tpl rename to admin-dev/themes/template/addons_my_account/content.tpl diff --git a/classes/Tools.php b/classes/Tools.php index cd47a332a..7311aeee6 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1259,7 +1259,7 @@ class ToolsCore { // 'CMSCategories' => 'cms_categories' // 'RangePrice' => 'range_price' - return strtolower(preg_replace('/([a-zA-Z])([A-Z][a-z])/', '$1_$2', $string)); + return strtolower(trim(preg_replace('/([A-Z][a-z])/', '_$1', $string), '_')); } public static function getBrightness($hex) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 81730df4f..585805b50 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -68,7 +68,7 @@ class AdminOrdersControllerCore extends AdminController 'total_paid' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '', 'suffix' => '', 'type' => 'price', 'currency' => true), 'payment' => array('title' => $this->l('Payment'), 'width' => 100), 'osname' => array('title' => $this->l('Status'), 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int', 'width' => 200), - 'date_add' => array('title' => $this->l('Date'), 'width' => 35, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), + 'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), 'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false)); $this->shopLinkType = 'shop';