From 40dd5fe4d8dc484b38de9c6450f06d5c986023a9 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 24 Apr 2013 10:37:12 -0400 Subject: [PATCH] =?UTF-8?q?BUG-10211=20No=20existe=20validacion=20en=20la?= =?UTF-8?q?=20opci=C3=B3n=20"Base=20Skin"...=20IMPROVEMENT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Notice __VALUE__. - Add validation. --- workflow/engine/classes/class.system.php | 2 +- workflow/engine/methods/setup/skin_Ajax.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index f1578e71b..fe27b8b0a 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -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']: ''; diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index d19c6c5a9..c92683d53 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -45,6 +45,7 @@ function skinList () G::loadClass( 'system' ); $skinList = System::getSkingList(); + //print_r($skinList); $wildcard = ''; if (isset( $_REQUEST['activeskin'] )) { $wildcard = '@'; @@ -56,7 +57,7 @@ function skinList () } 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' );