Skip to content

Commit

Permalink
update melis package version to 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mariateresapomar committed Jun 20, 2022
2 parents b206372 + cded57f commit c1a31c2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"melis-module-category": "core"
},
"require": {
"php": "^7.1.3|^7.2|^7.3",
"melisplatform/melis-core": "^4.0"
"php": "^7.3|^8.0",
"melisplatform/melis-core": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 1 addition & 2 deletions src/Controller/MelisMarketPlaceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ public function toolModuleFormSetupContentAction()
*/
public function melisMarketPlaceProductDoAction()
{
session_write_close();
set_time_limit(0);
ini_set('memory_limit', '-1');

Expand Down Expand Up @@ -762,7 +761,7 @@ public function isPackageDirectoryRemovableAction()
$response = [
'success' => $success,
'title' => $this->getTool()->getTranslation($title),
'message' => $this->getTool()->getTranslation($message, $module),
'message' => $this->getTool()->getTranslation($message, array($module)),
];

return new JsonModel($response);
Expand Down
7 changes: 5 additions & 2 deletions src/Service/MelisMarketPlaceSiteService.php
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,12 @@ protected function createInsertSql($tables, $parentTable = null)
// loop through all the fields and values in the data
foreach ($payload as $field => $value) {
$recursionSql = '';
// escape
$value = str_replace(["'", '"'], ["\'", '\"'], $value);

// escape
if (!is_array($value)) {
$value = str_replace(["'", '"'], ["\'", '\"'], $value);
}

if (!in_array($field, [Melis::RELATION, Site::THEN, Melis::PRIMARY_KEY])) {

if ($table === Melis::CMS_PAGE_PUBLISHED) {
Expand Down

0 comments on commit c1a31c2

Please sign in to comment.