Skip to content

Y
yii2
Commit 9414953f by Alexander Makarov
Options

Merge pull request #4998 from creocoder/aliases-to-bootstrap

Additional fixes for #4993
parents d1bfc01f f362f5b2
Showing with 2 additions and 2 deletions
apps/advanced/environments/dev/yii
...@@ -18,7 +18,7 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w')); ...@@ -18,7 +18,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/bootstrap.php'); require(__DIR__ . '/common/config/bootstrap.php');
require(__DIR__ . '/common/console/bootstrap.php'); require(__DIR__ . '/console/config/bootstrap.php');
$config = yii\helpers\ArrayHelper::merge( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),
......
apps/advanced/environments/prod/yii
...@@ -18,7 +18,7 @@ defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w')); ...@@ -18,7 +18,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/bootstrap.php'); require(__DIR__ . '/common/config/bootstrap.php');
require(__DIR__ . '/common/console/bootstrap.php'); require(__DIR__ . '/console/config/bootstrap.php');
$config = yii\helpers\ArrayHelper::merge( $config = yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/common/config/main.php'), require(__DIR__ . '/common/config/main.php'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment