merge master to release

vccw-team · Feb 22, 2015 · 4a93232 · 4a93232
2 parents 2b62c52 + 1046441
commit 4a93232
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/provision/site-cookbooks/wpcli/recipes/install.rb b/provision/site-cookbooks/wpcli/recipes/install.rb
@@ -64,7 +64,7 @@
 WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp core download \\
 --path=#{File.join(node[:wpcli][:wp_docroot], node[:wpcli][:wp_siteurl])} \\
 --locale=#{Shellwords.shellescape(node[:wpcli][:locale])} \\
---version=#{Shellwords.shellescape(node[:wpcli][:wp_version])} \\
+--version=#{Shellwords.shellescape(node[:wpcli][:wp_version].to_s)} \\
 --force
       EOH
   end
@@ -96,6 +96,10 @@
 define( 'WP_DEBUG', #{node[:wpcli][:debug_mode]} );
 define( 'FORCE_SSL_ADMIN', #{node[:wpcli][:force_ssl_admin]} );
 define( 'SAVEQUERIES', #{node[:wpcli][:savequeries]} );
+#{if node[:wpcli][:is_multisite] == true then <<MULTISITE
+define( 'WP_ALLOW_MULTISITE', true );
+MULTISITE
+end}
 PHP
   EOH
 end
@@ -203,7 +207,7 @@
     user node[:wpcli][:user]
     group node[:wpcli][:group]
     cwd File.join(node[:wpcli][:wp_docroot], node[:wpcli][:wp_siteurl])
-    code "WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp option update #{Shellwords.shellescape(key)} #{Shellwords.shellescape(value)}"
+    code "WP_CLI_CONFIG_PATH=#{Shellwords.shellescape(node[:wpcli][:config_path])} wp option update #{Shellwords.shellescape(key.to_s)} #{Shellwords.shellescape(value.to_s)}"
   end
 end