php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 00:20:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2239 from creocoder/aliases-fix

Browse Source 
Wrong path fixes
This commit is contained in:
Alexander Makarov
2014-01-31 08:42:07 -08:00
parent 0cfd41a21a 17c1bcb3f8
commit 3bdbb404a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/advanced/environments/dev/yii
View File

@@ -17,7 +17,7 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
require(__DIR__ . '/../../common/config/aliases.php'); require(__DIR__ . '/common/config/aliases.php');
$config = yii\helpers\ArrayHelper::merge( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),

2
apps/advanced/environments/prod/yii
View File

@@ -17,7 +17,7 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
require(__DIR__ . '/vendor/autoload.php'); require(__DIR__ . '/vendor/autoload.php');
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php'); require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
require(__DIR__ . '/../../common/config/aliases.php'); require(__DIR__ . '/common/config/aliases.php');
$config = yii\helpers\ArrayHelper::merge( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),