Wordpress 3.4 disallows empty prefix.

[wizard.git] / wizard / app / wordpress.py

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index 8043a4875e0053577334bce03a1c75edc305dd5a..bf77db40058f0f7ed6b8f20a999c2fb8c525a7bd 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -81,7 +81,7 @@ class Application(app.Application):
                 'uname': options.dsn.username,
                 'dbname': options.dsn.database,
                 'pwd': options.dsn.password,
-                'prefix': '',
+                'prefix': 'wp_', # Changed >= 3.4, now disallows empty prefix
                 'submit': 'Submit',
                 'step': '2',
                 }
@@ -115,13 +115,8 @@ class Application(app.Application):
         if "Finished" not in result and "Success" not in result:
             raise app.InstallFailure()
 
-        # not sure what to do about this
-        meta = sql.connect(options.dsn)
-        wp_options = meta.tables["wp_options"]
-        wp_options.update().where(wp_options.c.option_name == 'siteurl').values(option_value=options.web_path).execute()
-        wp_options.update().where(wp_options.c.option_name == 'home').values(option_value="http://%s%s" % (options.web_host, options.web_path)).execute() # XXX: what if missing leading slash; this should be put in a function
-
         if version < distutils.version.LooseVersion("3.0"):
+            meta = sql.connect(options.dsn)
             wp_users = meta.tables["wp_users"]
             hashed_pass = hashlib.md5(options.admin_password).hexdigest()
             wp_users.update().where(wp_users.c.ID == 1).values(user_login=options.admin_name,user_nicename=options.admin_name,display_name=options.admin_name,user_pass=hashed_pass).execute()
@@ -146,7 +141,8 @@ class Application(app.Application):
         php.ini_replace_vars()
     def upgrade(self, d, version, options):
         result = d.fetch("wp-admin/upgrade.php?step=1")
-        if "Upgrade Complete" not in result and "No Upgrade Required" not in result:
+        if "Upgrade Complete" not in result and "Update Complete" not in result and \
+                "No Upgrade Required" not in result and "No Update Required" not in result:
             raise app.UpgradeFailure(result)
     @app.throws_database_errors
     def backup(self, deployment, backup_dir, options):