Merge remote-tracking branch 'refs/remotes/origin/dev'

wecodemore · Jun 29, 2017 · ec6ca7b · ec6ca7b
2 parents 273ee8e + ce623f9
commit ec6ca7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/wpstarter/src/Setup/Steps/WPCliStep.php b/wpstarter/src/Setup/Steps/WPCliStep.php
@@ -74,7 +74,8 @@ public function allowed( Config $config, ArrayAccess $paths )
 	 */
 	public function run( ArrayAccess $paths )
 	{
-		$wp_install_path = rtrim( "{$paths['root']}/{$paths['wp']}", '/' );
+        // wp-cli.yml is stored in root (see targetPath()) so we can use relative path to root
+        $wp_install_path = rtrim( "./{$paths['wp']}", '/' );
 
 		$this->vars  = array( 'WP_INSTALL_PATH' => $wp_install_path, );
 		$build       = $this->builder->build(

diff --git a/wpstarter/templates/wp-config.example b/wpstarter/templates/wp-config.example
@@ -32,6 +32,8 @@ define('WPSTARTER_PATH', {{{ENV_REL_PATH}}});
  * @var array $env All the variables stored in environment variables
  */
 $env = WCM\WPStarter\Helpers::settings({{{ENV_REL_PATH}}}, '{{{ENV_FILE_NAME}}}');
+
+global $table_prefix;
 array_walk($env, function ($value, $name) {
     switch ($name) {
         case 'DB_TABLE_PREFIX':