fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1631 from marcoAntonioNina/BUG-10211

Browse Source 
Bug 10211BUG-10211 No existe validacion en la opción "Base Skin"... IMPROVEMENT
This commit is contained in:
julceslauhub
2013-04-24 07:51:24 -07:00
parent cd431dc29c 837981be5a
commit 3e6615169e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.system.php
View File

@@ -965,7 +965,7 @@ class System
$res['SKIN_FOLDER_ID'] = strtolower( $folderId ); $res['SKIN_FOLDER_ID'] = strtolower( $folderId );
foreach ($skinInformationArray as $keyInfo => $infoValue) { foreach ($skinInformationArray as $keyInfo => $infoValue) {
$res['SKIN_' . strtoupper( $keyInfo )] = $infoValue['__VALUE__']; $res['SKIN_' . strtoupper( $keyInfo )] = (isset($infoValue['__VALUE__'])) ? $infoValue['__VALUE__'] : '';
} }
$res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE']: ''; $res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE']: '';
$res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE']: ''; $res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE']: '';

2
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -56,7 +56,7 @@ function skinList ()
} }
foreach ($skinList['skins'] as $key => $value) { foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_ID'] != $classicSkin) { if (!isset($value['SKIN_ID']) || $value['SKIN_ID'] != $classicSkin) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') { if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) { if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' ); $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );