From 2a832e73fd32f19d0247f2ce6d7dccb987855996 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Mon, 20 Jul 2015 18:38:19 +0200
Subject: [PATCH] Repository: avoid error on parentTemplateObject type

---
 core/src/core/classes/class.Repository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/core/classes/class.Repository.php b/core/src/core/classes/class.Repository.php
index 00159b8d3e..972e5209f7 100644
--- 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)) {