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

[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376

Browse Source
This commit is contained in:
rMalie
2012-01-19 10:14:10 +00:00
parent 60d466b2f7
commit eee9b353c1
82 changed files with 432 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImagesController.php
+6 -6
View File
@@ -317,7 +317,7 @@ class AdminImagesControllerCore extends AdminController
/**
* Delete resized image then regenerate new one with updated settings
*/
private function _deleteOldImages($dir, $type, $product = false)
protected function _deleteOldImages($dir, $type, $product = false)
{
if (!is_dir($dir))
return false;
@@ -350,7 +350,7 @@ class AdminImagesControllerCore extends AdminController
}
// Regenerate images
private function _regenerateNewImages($dir, $type, $productsImages = false)
protected function _regenerateNewImages($dir, $type, $productsImages = false)
{
if (!is_dir($dir))
return false;
@@ -397,7 +397,7 @@ class AdminImagesControllerCore extends AdminController
}
// Regenerate no-pictures images
private function _regenerateNoPictureImages($dir, $type, $languages)
protected function _regenerateNoPictureImages($dir, $type, $languages)
{
$errors = false;
foreach ($type AS $k => $imageType)
@@ -416,7 +416,7 @@ class AdminImagesControllerCore extends AdminController
}
// Hook watermark optimization
private function _regenerateWatermark($dir)
protected function _regenerateWatermark($dir)
{
$result = Db::getInstance()->executeS('
SELECT m.`name` FROM `'._DB_PREFIX_.'module` m
@@ -442,7 +442,7 @@ class AdminImagesControllerCore extends AdminController
}
}
private function _regenerateThumbnails($type = 'all', $deleteOldImages = false)
protected function _regenerateThumbnails($type = 'all', $deleteOldImages = false)
{
$this->start_time = time();
ini_set('max_execution_time', $this->max_execution_time); // ini_set may be disabled, we need the real value
@@ -509,7 +509,7 @@ class AdminImagesControllerCore extends AdminController
/**
* Move product images to the new filesystem
*/
private function _moveImagesToNewFileSystem()
protected function _moveImagesToNewFileSystem()
{
if (!Image::testFileSystem())
$this->errors[] = Tools::displayError('Error: your server configuration is not compatible with the new image system. No images were moved');