Dev: replace getFieldFromParentConfiguration by __get override for cs…

…sframework_css/js
LimeSurvey · Aug 14, 2017 · 6c181b4 · 6c181b4
1 parent 680c6d3
commit 6c181b4
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -497,12 +497,6 @@ protected function getFrameworkAssetsToReplace( $sType, $bInlcudeRemove = false)
         $sFieldName  = 'cssframework_'.$sType;
         $aFieldValue = (array) json_decode($this->$sFieldName);
 
-        // Whole field inheritance
-        if ($this->$sFieldName == "inherit"){
-            $parentFieldValue = $this->getFieldFromParentConfiguration($sFieldName);
-            $aFieldValue = (array) json_decode($parentFieldValue);
-        }
-
         $aAssetsToRemove = array();
         if (!empty( $aFieldValue )){
             $aAssetsToRemove = (array) $aFieldValue['replace'] ;
@@ -595,7 +589,7 @@ public function getFieldFromParentConfiguration($sField){
 
     public function __get($name)
     {
-        $aAttributesThatCanBeInherited = array('files_css', 'files_js', 'options');
+        $aAttributesThatCanBeInherited = array('files_css', 'files_js', 'options', 'cssframework_css', 'cssframework_js');
 
         if (in_array($name, $aAttributesThatCanBeInherited)){
             // Full inheritance of the whole field