From 11e48a5432a8c3a317eb92105810e522444d77ce Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Tue, 14 Nov 2017 12:20:07 +0100
Subject: [PATCH] Fixed issue #12906: Extended vanilla template cannot be
 assigned to survey

---
 application/models/TemplateManifest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
index cfd5e676c91..08033c0df18 100644
--- a/application/models/TemplateManifest.php
+++ b/application/models/TemplateManifest.php
@@ -290,6 +290,8 @@ public static function importManifest($sTemplateName, $aDatas=array()  )
         $aDatas['packages_to_load']  = self::formatArrayFields($oREngineTemplate, 'engine', 'packages');
 
 
+
+
         // If empty in manifest, it should be the field in db, so the Mother Template css/js files will be used...
         if (is_object($oTemplate->config->files)){
             $aDatas['files_css']         = self::formatArrayFields($oTemplate, 'files', 'css');
@@ -335,7 +337,7 @@ public static function getTemplateForXPath($oTemplate, $sFieldPath)
      */
     public static function formatArrayFields($oTemplate, $sFieldPath, $sFieldName)
     {
-        return !empty($oTemplate->config->$sFieldPath->$sFieldName) ? ((array) $oTemplate->config->$sFieldPath->$sFieldName) : array();
+        return (empty($oTemplate->config->$sFieldPath->$sFieldName->value) )?array():$oTemplate->config->$sFieldPath->$sFieldName;
     }
 
     /**