Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into gli-689-2

Browse Source
This commit is contained in:
abhishek-webkul
2022-12-13 12:23:42 +05:30
committed by GitHub
parent 1e8c199279 2753f34338
commit f0fe46a58c
174 changed files with 4102 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/admin/AdminThemesController.php
View File

@@ -506,7 +506,7 @@ class AdminThemesControllerCore extends AdminController
) {
return false;
}
if (!$this->isFresh(Theme::CACHE_FILE_CUSTOMER_THEMES_LIST, 86400)) {
if (!$this->isFresh(Theme::CACHE_FILE_CUSTOMER_THEMES_LIST, _TIME_1_DAY_)) {
file_put_contents(_PS_ROOT_DIR_.Theme::CACHE_FILE_CUSTOMER_THEMES_LIST, Tools::addonsRequest('customer_themes'));
}
@@ -2075,6 +2075,15 @@ class AdminThemesControllerCore extends AdminController
}
}
break;
case 3:
foreach ($xml->modules as $row) {
if ($row['type'] == 'disk') {
foreach ($row->module as $row2) {
$natives[] = (string)$row2['name'];
}
}
}
break;
}
if (count($natives) > 0) {