Skip to content

Commit

Permalink
Dev Moved /assets directory to /tmp/assets
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Mar 13, 2013
1 parent 66992ca commit ba738dc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
11 changes: 11 additions & 0 deletions application/core/LSYii_Application.php
Expand Up @@ -103,7 +103,16 @@ public function __construct($config = null)
'enableCookieValidation'=>false // Enable to activate cookie protection
));

if (!isset($config['components']['assetManager']))
{
$config['components']['assetManager']=array();
}
$config['components']['assetManager']=array_merge_recursive($config['components']['assetManager'],array(
'basePath'=> dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'assets' // Enable to activate cookie protection
));

parent::__construct($config);

// Load the default and environmental settings from different files into self.
$ls_config = require(APPPATH . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config-defaults.php');
$email_config = require(APPPATH . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'email.php');
Expand All @@ -121,6 +130,8 @@ public function __construct($config = null)

foreach ($settings as $key => $value)
$this->setConfig($key, $value);

$this->getAssetManager()->setBaseUrl(Yii::app()->getBaseUrl(true) . '/tmp/assets');

// Now initialize the plugin manager
$this->initPluginManager();
Expand Down
4 changes: 0 additions & 4 deletions assets/.gitignore

This file was deleted.

0 comments on commit ba738dc

Please sign in to comment.