Repository: avoid error on parentTemplateObject type

pydio · Jul 20, 2015 · 2a832e7 · 2a832e7
1 parent 4fa4a7c
commit 2a832e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/core/classes/class.Repository.php b/core/src/core/classes/class.Repository.php
@@ -312,7 +312,7 @@ public function addOption($oName, $oValue)
     public function getOption($oName, $safe=false, $resolveUser = null)
     {
         if (!$safe && $this->inferOptionsFromParent) {
-            if (!isset($this->parentTemplateObject)) {
+            if (!isset($this->parentTemplateObject) || !is_a($this->parentTemplateObject, "Repository")) {
                 $this->parentTemplateObject = ConfService::getRepositoryById($this->parentId);
             }
             if (isSet($this->parentTemplateObject)) {