Merge pull request #1631 from marcoAntonioNina/BUG-10211

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
2 changed files with 4 additions and 4 deletions

View File

@@ -965,7 +965,7 @@ class System
$res['SKIN_FOLDER_ID'] = strtolower( $folderId );
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_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE']: '';

View File

@@ -49,14 +49,14 @@ function skinList ()
if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@';
}
$classicSkin = '';
if (defined('PARTNER_FLAG')) {
$classicSkin = '00000000000000000000000000000001';
}
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 ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );