Skip to content

Commit

Permalink
Dev: TemplateConfiguration->getFrameworkPackages
Browse files Browse the repository at this point in the history
  • Loading branch information
Shnoulle committed Dec 18, 2016
1 parent 2670326 commit 352c511
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions application/models/TemplateConfiguration.php
Expand Up @@ -353,12 +353,12 @@ private function getFrameworkPackages()
{
$framework=isset($this->cssFramework->name)? (string)$this->cssFramework->name : (string)$this->cssFramework;
if(isset(Yii::app()->clientScript->packages[$framework])){
$frameworPackages=array();
$frameworkPackages=array();
/* Theming */
$cssFrameworkCsss=isset($this->cssFramework->css) ? $this->cssFramework->css : array();
$cssFrameworkJss=isset($this->cssFramework->js) ? $this->cssFramework->js : array();
if(empty($cssFrameworkCsss) && empty($cssFrameworkJss)){
$frameworPackages[]=$framework;
$frameworkPackages[]=$framework;
}else{
/* Need to create an adapted core framework */
$cssFrameworkPackage=Yii::app()->clientScript->packages[$framework];
Expand Down Expand Up @@ -402,12 +402,12 @@ private function getFrameworkPackages()
'js' => $packageJs,
'depends' => $aDepends,
));
$frameworPackages[]=$framework.'-template';
$frameworkPackages[]=$framework.'-template';
}
if(getLanguageRTL(App()->getLanguage()) && isset(Yii::app()->clientScript->packages[$framework.'-rtl'])){
$frameworPackages[]=$framework.'-rtl';
$frameworkPackages[]=$framework.'-rtl';
}
return $frameworPackages;
return $frameworkPackages;
}
return array();
}
Expand Down

0 comments on commit 352c511

Please sign in to comment.