renamed AJXP_USE_UUID_PATH to AJXP_WORKSPACE_UUID AJXP_USE_SLUG to AJ…

…XP_WORKSPACE_SLUG
pydio · Mar 22, 2016 · e7c5ed3 · e7c5ed3
1 parent 2743b3c
commit e7c5ed3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/core/src/core/classes/class.Repository.php b/core/src/core/classes/class.Repository.php
@@ -366,13 +366,12 @@ public function getOption($oName, $safe=false, $resolveUser = null)
             if (isSet($parentTemplateObject)) {
                 $pvalue = $parentTemplateObject->getOption($oName, $safe);
                 $pathChanged = false;
-                if (is_string($pvalue) && strstr($pvalue, "AJXP_USE_UUID_PATH") !== false) {
-                    $pvalue = rtrim(str_replace("AJXP_USE_UUID_PATH", $this->getUniqueId(), $pvalue), "/");
+                if (is_string($pvalue) && strstr($pvalue, "AJXP_WORKSPACE_UUID") !== false) {
+                    $pvalue = rtrim(str_replace("AJXP_WORKSPACE_UUID", $this->getUniqueId(), $pvalue), "/");
                     $pathChanged = true;
                 }
-                if (is_string($pvalue) && strstr($pvalue, "AJXP_USE_SLUG") !== false) {
-                    $pvalue = rtrim(str_replace("AJXP_USE_SLUG", $this->getSlug(), $pvalue), "/");
-                    #return AJXP_Utils::securePath($value);
+                if (is_string($pvalue) && strstr($pvalue, "AJXP_WORKSPACE_SLUG") !== false) {
+                    $pvalue = rtrim(str_replace("AJXP_WORKSPACE_SLUG", $this->getSlug(), $pvalue), "/");
                     $pathChanged = true;
                 }
                 if (is_string($pvalue) && strstr($value, "AJXP_ALLOW_SUB_PATH") !== false) {