BUG 9296 User Experience - skins SOLVED
- We verified that not loaded correctly to the folder shared. - Was performed changes in the skinEngine and class.g to load the skin's if exists in the folder shared which should modify uxs and simplified.
This commit is contained in:
@@ -1065,10 +1065,10 @@ class G
|
|||||||
$configurationFile = G::ExpandPath( "skinEngine" ).'base'.PATH_SEP.'config.xml';
|
$configurationFile = G::ExpandPath( "skinEngine" ).'base'.PATH_SEP.'config.xml';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$configurationFile = G::ExpandPath( "skinEngine" ) . $skinName . PATH_SEP . 'config.xml';
|
$configurationFile = PATH_CUSTOM_SKINS . $skinName . PATH_SEP . 'config.xml';
|
||||||
|
|
||||||
if (!is_file($configurationFile)) {
|
if (!is_file($configurationFile)) {
|
||||||
$configurationFile = PATH_CUSTOM_SKINS . $skinName . PATH_SEP . 'config.xml';
|
$configurationFile = G::ExpandPath( "skinEngine" ) . $skinName . PATH_SEP . 'config.xml';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -93,12 +93,12 @@ class SkinEngine
|
|||||||
|
|
||||||
//Based on requested Skin look if there is any registered with that name
|
//Based on requested Skin look if there is any registered with that name
|
||||||
if (strtolower($this->mainSkin) != "classic") {
|
if (strtolower($this->mainSkin) != "classic") {
|
||||||
if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
|
if (defined('PATH_CUSTOM_SKINS') && is_dir(PATH_CUSTOM_SKINS . $this->mainSkin)) { // check this skin on user skins path
|
||||||
$skinObject = $this->skinsBasePath . $this->mainSkin;
|
|
||||||
}
|
|
||||||
else if (defined('PATH_CUSTOM_SKINS') && is_dir(PATH_CUSTOM_SKINS . $this->mainSkin)) { // check this skin on user skins path
|
|
||||||
$skinObject = PATH_CUSTOM_SKINS . $this->mainSkin;
|
$skinObject = PATH_CUSTOM_SKINS . $this->mainSkin;
|
||||||
}
|
}
|
||||||
|
else if (is_dir($this->skinsBasePath . $this->mainSkin)) { // check this skin on core skins path
|
||||||
|
$skinObject = $this->skinsBasePath . $this->mainSkin;
|
||||||
|
}
|
||||||
else { //Skin doesn't exist
|
else { //Skin doesn't exist
|
||||||
$this->mainSkin = "classic";
|
$this->mainSkin = "classic";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user