Skip to content

Commit ccace94

Browse files
authored
Merge pull request #656 from abhishek-webkul/changelog-1.6.0
Update Changelog and installation version 1.6.0 release
2 parents ff410ed + a91aab5 commit ccace94

File tree

115 files changed

+1091
-952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1091
-952
lines changed

CHANGELOG.txt

Lines changed: 333 additions & 0 deletions
Large diffs are not rendered by default.

CONTRIBUTORS.md

Lines changed: 0 additions & 418 deletions
This file was deleted.

admin/functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
if (!defined('_PS_ADMIN_DIR_')) {
2727
define('_PS_ADMIN_DIR_', getcwd());
2828
}
29-
require_once(_PS_ADMIN_DIR_.'/../images.inc.php');
29+
3030
function bindDatepicker($id, $time)
3131
{
3232
if ($time) {

architecture.md

Lines changed: 0 additions & 276 deletions
This file was deleted.

classes/webservice/WebserviceSpecificManagementImages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,6 @@ protected function writePostedImageOnDisk($reception_path, $dest_width = null, $
11271127
throw new WebserviceException(sprintf('The image size is too large (maximum allowed is %d KB)', ($this->imgMaxUploadSize / 1000)), array(72, 400));
11281128
}
11291129

1130-
require_once(_PS_CORE_DIR_.'/images.inc.php');
11311130
if ($error = ImageManager::validateUpload($file)) {
11321131
throw new WebserviceException('Image upload error : '.$error, array(76, 400));
11331132
}

0 commit comments

Comments
 (0)