From db245eaf61b357b35c8d6e743e737fd2a7a8444e Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 20 Jun 2010 07:48:06 -0700 Subject: [PATCH] Utilize new fields in installer script for Wordpress 3.0. Signed-off-by: Edward Z. Yang --- wizard/app/wordpress.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py index 65b99e7..add10ff 100644 --- a/wizard/app/wordpress.py +++ b/wizard/app/wordpress.py @@ -72,6 +72,10 @@ class Application(app.Application): 'admin_email': options.email, 'submit': 'Continue', 'step': '2', + # Version >= 3.0 + 'user_name': options.admin_name, + 'admin_password': options.admin_password, + 'admin_password2': options.admin_password, } old_mode = os.stat(".").st_mode os.chmod(".", 0777) # XXX: squick squick @@ -98,13 +102,13 @@ class Application(app.Application): 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 - # should also set the username and admin password - 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() - wp_usermeta = meta.tables["wp_usermeta"] - wp_usermeta.delete().where(wp_usermeta.c.user_id==1 and wp_usermeta.c.meta_key == "default_password_nag").execute() + if version < distutils.version.LooseVersion("3.0"): + 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() + wp_usermeta = meta.tables["wp_usermeta"] + wp_usermeta.delete().where(wp_usermeta.c.user_id==1 and wp_usermeta.c.meta_key == "default_password_nag").execute() # now we can restore the wp_mail function in wp-includes/pluggable[-functions].php pluggable_file = open(pluggable_path,'w') -- 2.45.0