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

// Fix missing Core suffix for some classes / controllers

Browse Source
This commit is contained in:
rMalie committed 2011-12-05 16:49:05 +00:00
1 parent 81b04a9d6f
commit ba8c205c33
19 files changed
+22 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/pdf/HTMLTemplateSupplyOrderForm.php
+1 -1
View File
@@ -28,7 +28,7 @@
/** /**
* @since 1.5 * @since 1.5
*/ */
class HTMLTemplateSupplyOrderForm extends HTMLTemplate class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
{ {
public $supply_order; public $supply_order;
public $warehouse; public $warehouse;
classes/stock/StockManagerModule.php
+1 -1
View File
@@ -28,7 +28,7 @@
/** /**
* @since 1.5.0 * @since 1.5.0
*/ */
abstract class StockManagerModule extends Module abstract class StockManagerModuleCore extends Module
{ {
public $stock_manager_class; public $stock_manager_class;
controllers/admin/AdminAccessController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminAccessController extends AdminController class AdminAccessControllerCore extends AdminController
{ {
/* Black list of id_tab that do not have access */ /* Black list of id_tab that do not have access */
public $accesses_black_list = array(107); public $accesses_black_list = array(107);
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminCartsController extends AdminController class AdminCartsControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminCatalogController.php
+1 -1
View File
@@ -26,7 +26,7 @@
*/ */
class AdminCatalogController extends AdminController class AdminCatalogControllerCore extends AdminController
{ {
/** @var object AdminCategories() instance */ /** @var object AdminCategories() instance */
//private $adminCategories; //private $adminCategories;
controllers/admin/AdminCurrenciesController.php
-2
View File
@@ -25,8 +25,6 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
include_once(_PS_ADMIN_DIR_.'/../classes/AdminTab.php');
class AdminCurrenciesControllerCore extends AdminController class AdminCurrenciesControllerCore extends AdminController
{ {
public function __construct() public function __construct()
controllers/admin/AdminGendersController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminGendersController extends AdminController class AdminGendersControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminGroupsController extends AdminController class AdminGroupsControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminImagesController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminImagesController extends AdminController class AdminImagesControllerCore extends AdminController
{ {
private $start_time = 0; private $start_time = 0;
private $max_execution_time = 7200; private $max_execution_time = 7200;
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -38,7 +38,7 @@ define('MAX_COLUMNS', 6);
/** correct Mac error on eof */ /** correct Mac error on eof */
@ini_set('auto_detect_line_endings', '1'); @ini_set('auto_detect_line_endings', '1');
class AdminImportController extends AdminController class AdminImportControllerCore extends AdminController
{ {
public static $column_mask; public static $column_mask;
controllers/admin/AdminLoginController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminLoginController extends AdminController class AdminLoginControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminModulesController.php
+2 -3
View File
@@ -25,9 +25,6 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php');
class AdminModulesControllerCore extends AdminController class AdminModulesControllerCore extends AdminController
{ {
@@ -75,6 +72,8 @@ class AdminModulesControllerCore extends AdminController
{ {
parent::__construct(); parent::__construct();
include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php');
// Set the modules categories // Set the modules categories
$this->list_modules_categories['administration']['name'] = $this->l('Administration'); $this->list_modules_categories['administration']['name'] = $this->l('Administration');
$this->list_modules_categories['advertising_marketing']['name'] = $this->l('Advertising & Marketing'); $this->list_modules_categories['advertising_marketing']['name'] = $this->l('Advertising & Marketing');
controllers/admin/AdminOrderMessageController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminOrderMessageController extends AdminController class AdminOrderMessageControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminPerformanceController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminPerformanceController extends AdminController class AdminPerformanceControllerCore extends AdminController
{ {
public function initFieldsetSmarty() public function initFieldsetSmarty()
{ {
controllers/admin/AdminQuickAccessesController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminQuickAccessesController extends AdminController class AdminQuickAccessesControllerCore extends AdminController
{ {
public function __construct() public function __construct()
{ {
controllers/admin/AdminStockConfigurationController.php
+1 -1
View File
@@ -28,7 +28,7 @@
/** /**
* @since 1.5.0 * @since 1.5.0
*/ */
class AdminStockConfigurationController extends AdminController class AdminStockConfigurationControllerCore extends AdminController
{ {
/* /*
* By default, we use StockMvtReason as the table / className * By default, we use StockMvtReason as the table / className
controllers/admin/AdminTrackingController.php
+1 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminTrackingController extends AdminController class AdminTrackingControllerCore extends AdminController
{ {
public function postprocess() public function postprocess()
{ {
controllers/admin/AdminTranslationsController.php
+4 -2
View File
@@ -25,8 +25,6 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php');
include_once(_PS_ADMIN_DIR_.'/../tools/pear/PEAR.php');
define ('TEXTAREA_SIZED', 70); define ('TEXTAREA_SIZED', 70);
class AdminTranslationsControllerCore extends AdminController class AdminTranslationsControllerCore extends AdminController
@@ -49,6 +47,10 @@ class AdminTranslationsControllerCore extends AdminController
public function __construct() public function __construct()
{ {
parent::__construct(); parent::__construct();
include_once(_PS_ADMIN_DIR_.'/../tools/tar/Archive_Tar.php');
include_once(_PS_ADMIN_DIR_.'/../tools/pear/PEAR.php');
self::$tpl_regexp = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( mod=\'.+\')?( js=1)?\}/U'; self::$tpl_regexp = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( mod=\'.+\')?( js=1)?\}/U';
// added ? after spaces because some peoples forget them. see PSCFI-2501 // added ? after spaces because some peoples forget them. see PSCFI-2501
self::$php_regexp = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; self::$php_regexp = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U';
controllers/front/PdfOrderReturnController.php
+1 -1
View File
@@ -35,7 +35,7 @@ class PdfOrderReturnControllerCore extends FrontController
if (!$this->context->customer->isLogged()) if (!$this->context->customer->isLogged())
Tools::redirect('index.php?controller=authentication&back=order-follow'); Tools::redirect('index.php?controller=authentication&back=order-follow');
if (isset(Tools::getValue('id_order_return')) && Validate::isUnsignedId(Tools::getValue('id_order_return'))) if (Tools::getValue('id_order_return') && Validate::isUnsignedId(Tools::getValue('id_order_return')))
$this->orderReturn = new OrderReturn(Tools::getValue('id_order_return')); $this->orderReturn = new OrderReturn(Tools::getValue('id_order_return'));
if (!isset($this->orderReturn) || !Validate::isLoadedObject($this->orderReturn)) if (!isset($this->orderReturn) || !Validate::isLoadedObject($this->orderReturn))