This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-10-10 12:33:25 -04:00
parent 216e2dca28
commit 8ac8e50691
152 changed files with 416 additions and 416 deletions

View File

@@ -310,9 +310,9 @@ class Menu
$target = $this->Options[$intPos];
if ($this->Types[$intPos] != "absolute") {
if (defined('ENABLE_ENCRYPT')) {
$target = "/sys" . config("sys_sys") . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target;
} elseif (defined('SYS_SYS')) {
$target = "/sys" . config("sys_sys") . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target;
$target = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target;
} elseif (!empty(config("system.workspace"))) {
$target = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target;
} else {
$target = "/sys/" . SYS_LANG . "/" . SYS_SKIN . "/" . $target;
}
@@ -358,7 +358,7 @@ class Menu
$target = $this->Options[$ncount];
}
if ($this->Types[$ncount] != 'absolute') {
if (defined('SYS_SYS')) {
if (!empty(config("system.workspace"))) {
$target = '/sys' . SYS_TEMP . G::encryptLink('/' . SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]);
} else {
$target = '/sys/' . G::encryptLink(SYS_LANG . '/' . SYS_SKIN . '/' . $this->Options[$ncount]);