Merge pull request #81 from delphaber/master

Fix #79
welaika · Apr 9, 2014 · 4f17cfa · 4f17cfa
2 parents 3df9fed + c93b15f
commit 4f17cfa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/wordmove/deployer/base.rb b/lib/wordmove/deployer/base.rb
@@ -196,6 +196,7 @@ def mysql_dump_command(options, save_to_path)
       def mysql_import_command(dump_path, options)
         arguments = [ "mysql" ]
         arguments << "--host=#{options[:host]}" if options[:host].present?
+        arguments << "--port=#{options[:port]}" if options[:port].present?
         arguments << "--user=#{options[:user]}" if options[:user].present?
         arguments << "--password=#{options[:password]}" if options[:password].present?
         arguments << "--database=#{options[:name]}"

diff --git a/lib/wordmove/deployer/ftp.rb b/lib/wordmove/deployer/ftp.rb
@@ -76,6 +76,8 @@ def remote_put(thing, path)
       end
 
       def escape_php(string)
+        return '' unless string
+
         # replaces \ with \\
         # replaces ' with \'
         string.gsub('\\','\\\\\\').gsub(/[']/, '\\\\\'')